diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-02 16:57:10 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-02 16:57:10 +0000 |
| commit | 0adfe112c1e961606d9e11a47dfb16d038f4b0f3 (patch) | |
| tree | bbd5942412b7743fd48a257955d49da50e395f6b /libjava | |
| parent | e3345358af4f2f3eb02d9e1481d1c581f0408070 (diff) | |
| download | gcc-0adfe112c1e961606d9e11a47dfb16d038f4b0f3.tar.gz | |
Backport from mainline:
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@160168 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog | 16 | ||||
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 11 | ||||
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 11 |
3 files changed, 30 insertions, 8 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 7b4f27e504b..9ad72399c43 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,19 @@ +2010-06-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + Backport from mainline: + 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-04-29 Jakub Jelinek <jakub@redhat.com> PR other/43620 diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index dfaaf024d3b..1517938242a 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -373,6 +373,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. @@ -385,11 +388,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 665381d103e..2aa55d8bee6 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 @@ -1364,6 +1364,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; \ |