changeset in /hg/icedtea6: Create a copy of the generated files ...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 29 14:57:35 PDT 2008
changeset ce9440257cfe in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ce9440257cfe
description:
Create a copy of the generated files for out-of-dir builds
so we don't attempt to overwrite part of the source directory.
ChangeLog:
2008-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Use build directory for
generated directory, and copy there at
the start if we are doing an out-of-directory
build.
* Makefile.in: Regenerated.
diffstat:
3 files changed, 28 insertions(+), 10 deletions(-)
ChangeLog | 8 ++++++++
Makefile.am | 15 ++++++++++-----
Makefile.in | 15 ++++++++++-----
diffs (126 lines):
diff -r f6f00c3a9758 -r ce9440257cfe ChangeLog
--- a/ChangeLog Sun Jun 29 21:42:50 2008 +0200
+++ b/ChangeLog Sun Jun 29 22:57:23 2008 +0100
@@ -3,6 +3,14 @@ 2008-06-29 Mark Wielaard <mark at klomp.o
* Makefile.am (stamps/icedtea-ecj.stamp): Add dependency on
stamps/cacao.stamp.
(stamps/cacao.stamp): Add dependency on stamps/rt-class-files.stamp.
+ * Makefile.in: Regenerated.
+
+2008-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am: Use build directory for
+ generated directory, and copy there at
+ the start if we are doing an out-of-directory
+ build.
* Makefile.in: Regenerated.
2008-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
diff -r f6f00c3a9758 -r ce9440257cfe Makefile.am
--- a/Makefile.am Sun Jun 29 21:42:50 2008 +0200
+++ b/Makefile.am Sun Jun 29 22:57:23 2008 +0100
@@ -166,7 +166,7 @@ ICEDTEA_ENV_ECJ = \
"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_srcdir)/generated" \
+ "GENSRCDIR=$(abs_top_builddir)/generated" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
@@ -415,6 +415,11 @@ if !USE_SYSTEM_CACAO
fi
endif
endif
+ if [ ! -e $(abs_top_builddir)/generated ]; then \
+ cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
+ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
+ -o -type d -exec chmod 750 '{}' ';'; \
+ fi
mkdir -p stamps
touch stamps/extract.stamp
@@ -911,12 +916,12 @@ stamps/hotspot-tools-class-files.stamp:
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
-bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
-bootclasspath '' @$< ; \
fi
mkdir -p stamps
@@ -958,12 +963,12 @@ stamps/rt-class-files.stamp: rt-source-f
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
-bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
-bootclasspath '' @$< ; \
fi
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
diff -r f6f00c3a9758 -r ce9440257cfe Makefile.in
--- a/Makefile.in Sun Jun 29 21:42:50 2008 +0200
+++ b/Makefile.in Sun Jun 29 22:57:23 2008 +0100
@@ -361,7 +361,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
"BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
$(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_srcdir)/generated" \
+ "GENSRCDIR=$(abs_top_builddir)/generated" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
@@ -900,6 +900,11 @@ stamps/extract.stamp: stamps/download.st
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ mkdir cacao ; \
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi
+ if [ ! -e $(abs_top_builddir)/generated ]; then \
+ cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
+ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
+ -o -type d -exec chmod 750 '{}' ';'; \
+ fi
mkdir -p stamps
touch stamps/extract.stamp
@@ -1331,12 +1336,12 @@ stamps/hotspot-tools-class-files.stamp:
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
-bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+ -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated:$(abs_top_srcdir)/rt' \
-bootclasspath '' @$< ; \
fi
mkdir -p stamps
@@ -1378,12 +1383,12 @@ stamps/rt-class-files.stamp: rt-source-f
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
-bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
-bootclasspath '' @$< ; \
fi
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
More information about the distro-pkg-dev
mailing list