diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-03-01 12:32:02 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-03-01 12:32:02 +0000 |
| commit | 199cb84e3c198d1f47a386f7756f6c35ae4c0a25 (patch) | |
| tree | 928846b1de85d6704f8295582d018d869bdf20d5 /libjava/classpath | |
| parent | 7d82c626c3b226392f82d873d03940be44512321 (diff) | |
| download | gcc-199cb84e3c198d1f47a386f7756f6c35ae4c0a25.tar.gz | |
re PR libgcj/38251 (tools.zip doesn't build on systems with short command lines)
PR libgcj/38251
* tools/Makefile.am (dist-hook): Prune .svn directories in asm and
classes copies.
* tools/Makefile.in: Regenerate.
Revert:
2008-11-05 Andrew Haley <aph@redhat.com>
* tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
.svn direcories.
From-SVN: r157137
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog | 13 | ||||
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 11 | ||||
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 11 |
3 files changed, 27 insertions, 8 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index fa4171ba5bc..4c1362e000e 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,16 @@ +2010-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libgcj/38251 + * tools/Makefile.am (dist-hook): Prune .svn directories in asm and + classes copies. + * tools/Makefile.in: Regenerate. + + Revert: + 2008-11-05 Andrew Haley <aph@redhat.com> + + * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude + .svn direcories. + 2010-01-18 Andreas Tobler <andreast@fgznet.ch> * tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o. diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 44bc49fdf29..44489c89afd 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -371,6 +371,9 @@ endif ## BEGIN GCJ LOCAL cp -pR $(srcdir)/asm . cp -pR $(srcdir)/classes . + if [ -d asm/.svn ]; then \ + find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \ + fi ## END GCJ LOCAL if CREATE_GJDOC ## Copy over gjdoc resource files. @@ -383,11 +386,11 @@ if CREATE_GJDOC endif if WITH_JAR -CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` -UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` +CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) . +UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) . else -CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` -UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` +CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) . +UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) . endif ## First add classpath tools stuff. diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 1258e328958..5f3052d0d20 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -708,10 +708,10 @@ noinst_DATA = $(TOOLS_ZIP) # Where we want these data files installed. TOOLSdir = $(pkgdatadir) -@WITH_JAR_FALSE@CREATE_TOOLS_ZIP = $(ZIP) -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` -@WITH_JAR_TRUE@CREATE_TOOLS_ZIP = $(JAR) cf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` -@WITH_JAR_FALSE@UPDATE_TOOLS_ZIP = $(ZIP) -u -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` -@WITH_JAR_TRUE@UPDATE_TOOLS_ZIP = $(JAR) uf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print` +@WITH_JAR_FALSE@CREATE_TOOLS_ZIP = $(ZIP) -r ../$(TOOLS_ZIP) . +@WITH_JAR_TRUE@CREATE_TOOLS_ZIP = $(JAR) cf ../$(TOOLS_ZIP) . +@WITH_JAR_FALSE@UPDATE_TOOLS_ZIP = $(ZIP) -u -r ../$(TOOLS_ZIP) . +@WITH_JAR_TRUE@UPDATE_TOOLS_ZIP = $(JAR) uf ../$(TOOLS_ZIP) . all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1424,6 +1424,9 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) done cp -pR $(srcdir)/asm . cp -pR $(srcdir)/classes . + if [ -d asm/.svn ]; then \ + find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \ + fi @CREATE_GJDOC_TRUE@ for res in $(gjdoc_resources); do \ @CREATE_GJDOC_TRUE@ dir=classes/`dirname $$res`; \ @CREATE_GJDOC_TRUE@ if ! test -d "$$dir"; then @mkdir_p@ "$$dir"; fi; \ |