You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/01/30 22:39:15 UTC

cvs commit: xml-xerces/java/src Makefile.incl

neilg       01/01/30 13:39:15

  Modified:    java     Makefile build.xml
               java/src/org/apache/xerces/framework Version.java
               java/src Makefile.incl
  Log:
  preparations for Xerces 1.3.0 release.  Also simplify creation of tar.gz packages.
  
  Revision  Changes    Path
  1.21      +53 -1     xml-xerces/java/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/Makefile,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Makefile	2000/08/29 22:33:17	1.20
  +++ Makefile	2001/01/30 21:39:14	1.21
  @@ -1,5 +1,10 @@
   # Top Makefile
   
  +# Note:  To produce tar.gz files instead of .zip files when 
  +# make'ing the pachages, change the package_bin dependency to
  +# ${BINTARFILE} from ${BINZIPFILE} and do the same for
  +# package_src.
  +
   all:: compile jars docs apidocs package
   
   TOP = .
  @@ -63,6 +68,37 @@
   	$(JAR) cvfM ${BINZIPFILE} xerces-${PRODUCTVERSION} 
   	$(MV) xerces-${PRODUCTVERSION} bin
   
  +${BINTARFILE}:: ./src/classfiles_updated
  +
  +	@echo Building the binary release package
  +	${MKDIR} bin
  +	${MKDIR} bin/samples
  +	${MKDIR} bin/samples/dom
  +	${CP} samples/dom/*.java bin/samples/dom
  +	${MKDIR} bin/samples/dom/traversal
  +	${CP} samples/dom/traversal/*.java bin/samples/dom/traversal
  +	${MKDIR} bin/samples/dom/wrappers
  +	${CP} samples/dom/wrappers/*.java bin/samples/dom/wrappers
  +	${MKDIR} bin/samples/sax
  +	${CP} samples/sax/*.java bin/samples/sax
  +	${MKDIR} bin/samples/sax/helpers
  +	${CP} samples/sax/helpers/*.java bin/samples/sax/helpers
  +	${MKDIR} bin/samples/ui
  +	${CP} samples/ui/*.java bin/samples/ui
  +	${MKDIR} bin/samples/util
  +	${CP} samples/util/*.java bin/samples/util
  +	${CP} -r docs bin
  +	${RM} -r bin/docs/CVS
  +	${RM} -r bin/docs/dtd/CVS
  +	${RM} -r bin/docs/*.xml bin/docs/dtd/*.dtd bin/docs/dtd/*.ent
  +	${CP} -r data bin
  +	${RM} -r bin/data/CVS
  +	${CP} LICENSE bin
  +	$(MV) bin xerces-${PRODUCTVERSION}
  +	$(TAR) cvf ${BINTARFILE} xerces-${PRODUCTVERSION} 
  +	$(GZIP) ${BINTARFILE} 
  +	$(MV) xerces-${PRODUCTVERSION} bin
  +
   package_src:: ${SRCZIPFILE}
   ${SRCZIPFILE}: ./src/classfiles_updated
   	@echo Building the source release package
  @@ -79,8 +115,24 @@
   	$(JAR) cvfM ${SRCZIPFILE} xerces-${PRODUCTVERSION} 
   	$(MV) xerces-${PRODUCTVERSION} source
   
  +${SRCTARFILE}: ./src/classfiles_updated
  +	@echo Building the source release package
  +	${MAKE} -C src package_src
  +	${CP} -r data source
  +	${RM} -r source/data/CVS
  +	${MKDIR} source/docs
  +	${MKDIR} source/docs/dtd
  +	${CP} docs/*.xml source/docs
  +	${CP} LICENSE source
  +	${CP} docs/dtd/*.dtd source/docs/dtd
  +	${CP} docs/dtd/*.ent source/docs/dtd
  +	$(MV) source xerces-${PRODUCTVERSION}
  +	$(TAR) cvf ${SRCTARFILE} xerces-${PRODUCTVERSION} 
  +	$(GZIP) ${SRCTARFILE}
  +	$(MV) xerces-${PRODUCTVERSION} source
  +
   clean::
   	${MAKE} -C src clean
   	${MAKE} -C samples clean
   	${RM} -rf bin class source docs/apiDocs docs/html 
  -	${RM} ${BINZIPFILE} ${SRCZIPFILE}
  +	${RM} ${BINZIPFILE} ${SRCZIPFILE} ${BINGZFILE} ${SRCGZFILE}
  
  
  
  1.35      +5 -5      xml-xerces/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	2001/01/23 18:15:07	1.34
  +++ build.xml	2001/01/30 21:39:14	1.35
  @@ -51,7 +51,7 @@
   Copyright:
     Copyright (c) 2000 The Apache Software Foundation.
   
  -   $Id: build.xml,v 1.34 2001/01/23 18:15:07 lehors Exp $
  +   $Id: build.xml,v 1.35 2001/01/30 21:39:14 neilg Exp $
   
   ==================================================================== -->
   
  @@ -60,10 +60,10 @@
     <target name="init">
       <property name="name" value="xerces"/>
       <property name="Name" value="xerces-J"/>
  -    <property name="version" value="1.2.3"/>
  -    <property name="version_postfix" value=".1.2.3"/>
  -    <property name="appendit" value="1_2_3"/>
  -    <property name="year" value="1999-2000"/>
  +    <property name="version" value="1.3.0"/>
  +    <property name="version_postfix" value=".1.3.0"/>
  +    <property name="appendit" value="1_3_0"/>
  +    <property name="year" value="1999-2001"/>
       <property name="copyright" value="Copyright &#169; ${year} Apache XML Project. All Rights Reserved."/>
   
       <echo message= "---------------- ${Name} ${version} [${year}] ---------------"/>
  
  
  
  1.16      +1 -1      xml-xerces/java/src/org/apache/xerces/framework/Version.java
  
  Index: Version.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/Version.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Version.java	2000/12/06 00:01:37	1.15
  +++ Version.java	2001/01/30 21:39:14	1.16
  @@ -69,7 +69,7 @@
       //
   
       /** Version string. */
  -    public static String  fVersion = "Xerces 1.2.3";
  +    public static String  fVersion = "Xerces 1.3.0";
   
       //
       // MAIN
  
  
  
  1.43      +7 -2      xml-xerces/java/src/Makefile.incl
  
  Index: Makefile.incl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/Makefile.incl,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- Makefile.incl	2000/12/06 00:01:36	1.42
  +++ Makefile.incl	2001/01/30 21:39:15	1.43
  @@ -18,6 +18,8 @@
   SB_CLPATH = $(STYLEBOOK_CLPATH)$(CLPATHSEP)$(CLASSPATH)
   
   JAR = jar
  +TAR = tar
  +GZIP = gzip
   JAVAC = javac
   ifeq ($(JDK12BIN),)
   JAVA12 = java
  @@ -36,8 +38,8 @@
   #
   # Define the version strings
   #
  -PRODUCTVERSION = 1_2_3
  -PRODUCTVERSION_DOT = 1.2.3
  +PRODUCTVERSION = 1_3_0
  +PRODUCTVERSION_DOT = 1.3.0
   PRODUCTNAME = Xerces
   
   #define the jar file names
  @@ -71,6 +73,9 @@
   
   BINTARFILE = ${PRODUCTNAME}-J-bin.${PRODUCTVERSION_DOT}.tar
   SRCTARFILE = ${PRODUCTNAME}-J-src.${PRODUCTVERSION_DOT}.tar
  +
  +BINGZFILE = ${PRODUCTNAME}-J-bin.${PRODUCTVERSION_DOT}.tar.gz
  +SRCGZFILE = ${PRODUCTNAME}-J-src.${PRODUCTVERSION_DOT}.tar.gz
   
   BINJARFILE = ${PRODUCTNAME}-J-bin.${PRODUCTVERSION_DOT}.jar
   SRCJARFILE = ${PRODUCTNAME}-J-src.${PRODUCTVERSION_DOT}.jar