diff options
Diffstat (limited to 'java/classpath/files')
| -rw-r--r-- | java/classpath/files/ecj.sh.in | 2 | ||||
| -rw-r--r-- | java/classpath/files/patch-lib__Makefile.in | 11 | ||||
| -rw-r--r-- | java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java | 27 |
3 files changed, 38 insertions, 2 deletions
diff --git a/java/classpath/files/ecj.sh.in b/java/classpath/files/ecj.sh.in deleted file mode 100644 index c2562fbcc4fd..000000000000 --- a/java/classpath/files/ecj.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -"%%JAVA%%" -classpath "%%ECJ_JAR%%" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}" diff --git a/java/classpath/files/patch-lib__Makefile.in b/java/classpath/files/patch-lib__Makefile.in new file mode 100644 index 000000000000..49fb4086548d --- /dev/null +++ b/java/classpath/files/patch-lib__Makefile.in @@ -0,0 +1,11 @@ +--- lib/Makefile.in.orig 2012-03-08 18:54:14.000000000 -0500 ++++ lib/Makefile.in 2012-10-03 18:17:34.000000000 -0400 +@@ -316,7 +316,7 @@ + @INSTALL_GLIBJ_ZIP_TRUE@glibj_DATA = glibj.zip $(COLLECTIONS) + @BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources + @USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_FALSE@CREATE_GLIBJ_ZIP = $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null +-@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_TRUE@CREATE_GLIBJ_ZIP = $(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i glibj.zip ++@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_TRUE@CREATE_GLIBJ_ZIP = $(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i $(builddir)/glibj.zip + #endif + EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh glibj.zip + CLEANFILES = compile-classes resources classes \ diff --git a/java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java b/java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java new file mode 100644 index 000000000000..9185d8bae3cc --- /dev/null +++ b/java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java @@ -0,0 +1,27 @@ +--- tools/gnu/classpath/tools/jar/Updater.java.orig 2010-06-03 15:14:36.000000000 -0400 ++++ tools/gnu/classpath/tools/jar/Updater.java 2012-09-20 16:26:23.000000000 -0400 +@@ -70,9 +70,13 @@ + // Set this early so that createManifest can use it. + inputJar = new JarFile(parameters.archiveFile); + ++ // Find the current directory. ++ File tmpDir = parameters.archiveFile.getParentFile(); ++ if (tmpDir == null) ++ tmpDir = new File("."); ++ + // Write all the new entries to a temporary file. +- File tmpFile = File.createTempFile("jarcopy", null, +- parameters.archiveFile.getParentFile()); ++ File tmpFile = File.createTempFile("jarcopy", null, tmpDir); + OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile)); + writeCommandLineEntries(parameters, os); + +@@ -91,7 +95,7 @@ + if (!tmpFile.renameTo(parameters.archiveFile)) + { + throw new IOException("Couldn't rename new JAR file " + tmpFile + +- "to " + parameters.archiveFile); ++ " to " + parameters.archiveFile); + } + } + |