A better fix for creating src.jar. Using tar by itself fails because the

argument list is too long.  Hence the first patch invoked tar once for
each file.  This works, but is inefficient.  This version of the patch
uses cpio in pass through mode to copy all the files at once.

PR:		35658
Submitted by:	"Remco van 't Veer" <rwvtveer@xs4all.nl>
Reviewed by:	sobomax
Approved by:	sobomax
This commit is contained in:
Greg Lewis 2002-04-12 05:00:52 +00:00
parent 47b0e09d4c
commit 51a22b820e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57603
4 changed files with 16 additions and 20 deletions

View file

@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
retrieving revision 1.7
diff -u -r1.7 common/Release.gmk
--- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7
+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000
@@ -521,10 +521,18 @@
+++ common/Release.gmk 10 Apr 2002 18:02:30 -0000
@@ -521,10 +521,17 @@
@# src.jar
@#
$(MKDIR) -p $(JDK_IMAGE_DIR)/src
+ifeq ($(PLATFORM), bsd)
+ # Avoid the "argument list too long" problem.
+ ($(CD) $(SHARE_SRC)/classes; \
+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \
+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \
+ done)
+ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \
+ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
+else
($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
`$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \

View file

@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
retrieving revision 1.7
diff -u -r1.7 common/Release.gmk
--- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7
+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000
@@ -521,10 +521,18 @@
+++ common/Release.gmk 10 Apr 2002 18:02:30 -0000
@@ -521,10 +521,17 @@
@# src.jar
@#
$(MKDIR) -p $(JDK_IMAGE_DIR)/src
+ifeq ($(PLATFORM), bsd)
+ # Avoid the "argument list too long" problem.
+ ($(CD) $(SHARE_SRC)/classes; \
+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \
+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \
+ done)
+ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \
+ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
+else
($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
`$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \

View file

@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
retrieving revision 1.7
diff -u -r1.7 common/Release.gmk
--- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7
+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000
@@ -521,10 +521,18 @@
+++ common/Release.gmk 10 Apr 2002 18:02:30 -0000
@@ -521,10 +521,17 @@
@# src.jar
@#
$(MKDIR) -p $(JDK_IMAGE_DIR)/src
+ifeq ($(PLATFORM), bsd)
+ # Avoid the "argument list too long" problem.
+ ($(CD) $(SHARE_SRC)/classes; \
+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \
+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \
+ done)
+ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \
+ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
+else
($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
`$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \

View file

@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
retrieving revision 1.7
diff -u -r1.7 common/Release.gmk
--- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7
+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000
@@ -521,10 +521,18 @@
+++ common/Release.gmk 10 Apr 2002 18:02:30 -0000
@@ -521,10 +521,17 @@
@# src.jar
@#
$(MKDIR) -p $(JDK_IMAGE_DIR)/src
+ifeq ($(PLATFORM), bsd)
+ # Avoid the "argument list too long" problem.
+ ($(CD) $(SHARE_SRC)/classes; \
+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \
+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \
+ done)
+ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \
+ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
+else
($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
`$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \