You are viewing a plain text version of this content. The canonical link for it is here.
Posted to juice-svn@xml.apache.org by bl...@apache.org on 2006/02/21 10:57:21 UTC
svn commit: r379404 - in /incubator/juice: buildNew.xml configure.ac
native/Makefile.am
Author: blautenb
Date: Tue Feb 21 01:57:18 2006
New Revision: 379404
URL: http://svn.apache.org/viewcvs?rev=379404&view=rev
Log:
Changes to support moving native code back to src from srcNew
Modified:
incubator/juice/buildNew.xml
incubator/juice/configure.ac
incubator/juice/native/Makefile.am
Modified: incubator/juice/buildNew.xml
URL: http://svn.apache.org/viewcvs/incubator/juice/buildNew.xml?rev=379404&r1=379403&r2=379404&view=diff
==============================================================================
--- incubator/juice/buildNew.xml (original)
+++ incubator/juice/buildNew.xml Tue Feb 21 01:57:18 2006
@@ -1,145 +1,145 @@
-<project default="compile" basedir=".">
-
- <target name="init">
- <property name="distname" value="JuiCE"/>
-
- <property name='product.Name' value='Apache JCE Provider for openSSL crypto library'/>
- <property name='product.name' value='JuiCE'/>
- <property name='product.shortname' value='juice'/>
-
- <property name='product.version.major' value='0'/>
- <property name='product.version.minor' value='9'/>
- <property name='product.version.level' value='0'/>
- <property name='product.Version' value='${product.version.major}.${product.version.minor}.${product.version.level}'/>
- <property name='product.version' value='${product.version.major}.${product.version.minor}.${product.version.level}'/>
- <property name='product_version' value='${product.version.major}_${product.version.minor}_${product.version.level}'/>
- <property name="year" value="2006"/>
- <property name="copyright" value="Copyright © ${year} Apache WS-Security Project. All Rights Reserved."/>
-
-
- <!-- set global properties for this build -->
- <property name="root" value="java"/>
- <property name="src" value="${root}/src"/>
- <property name="tests" value="${src}/test"/>
- <property name="build.dir" value="./build"/>
- <property name="build.classes" value="${build.dir}/classes"/>
-
- <property name="native" value="./native"/>
-
- <property name="dir.dist" value="./dist"/>
- <property name="dir.libs" value="./lib"/>
-
- <property name="build.doc" value="${build.dir}/doc"/>
-
- <property name="jar.library" value="${product.shortname}.jar"/>
-
-
- <path id="test.libraries" description="3rd party libs">
- <fileset dir="${dir.dist}">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${dir.libs}">
- <include name="**/*.jar"/>
- </fileset>
- <pathelement path="${build.classes}"/>
- </path>
- </target>
-
- <target name="jar" depends="compile" description="Create the juice jar file" >
- <jar jarfile="${dir.dist}/${jar.library}"
- basedir="${build.classes}"
- includes="**/apache/**/security/juice/**" />
- </target>
-
-<!-- <target name="dist" depends="compile, headers" /> -->
- <target name="bindist" depends="compile" description="Build zip file for distro">
- <zip destfile=
- "${dir.dist}/${product.shortname}-bin-${product.version}.zip">
- <zipfileset prefix="juice" dir="."
- includes="LICENSES/**, README.txt, juice-0.0.1.tar.gz, java/src/test/**" />
- <zipfileset prefix="juice/classes" dir="${build.classes}"
- includes="*.properties, test/**"/>
-<!-- <zipfileset prefix="juice/doc/api" dir="${build.javadoc}"/> -->
- <zipfileset fullpath="juice/${jar.library}" dir="${dir.dist}"
- includes="${jar.library}"/>
- </zip>
- </target>
-
-
- <!-- Prepare directory structure for project build-->
- <target name="prepare" depends="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${dir.dist}"/>
- </target>
-
- <!-- Compile classes and move them to ${build.classes} -->
- <target name="compile" depends="prepare">
- <javac srcdir="${src}" destdir="${build.classes}" includes="**/apache/**/*.java" excludes="**/jce/*.java" debug="on">
- </javac>
- </target>
-
- <!-- Delete the ${build} and ${dist} directory trees -->
- <target name="clean" depends="clean-build, clean-dist, clean-native"/>
-
- <target name="clean-build">
- <delete dir="${build.dir}"/>
- </target>
-
- <target name="clean-dist">
- <delete dir="${dir.dist}"/>
- </target>
-
- <target name="clean-native">
- </target>
-
- <!-- Create C headers
- <target name="headers">
- <javah outputFile="${native}/src/juice.h" force="yes">
- <class name="org.apache.security.jce.MD5"/>
- <class name="org.apache.security.jce.SHA"/>
- <class name="org.apache.security.jce.RSA"/>
- <class name="org.apache.security.jce.SecureRandom"/>
- <classpath refid="build.path"/>
- </javah>
- </target>
- -->
- <target name="compile-tests" depends="compile">
- <javac srcdir="${src}" destdir="${build.classes}" includes="**/test/*.java" debug="on">
- <classpath refid="test.libraries" />
- </javac>
- </target>
-
- <target name="test" depends="compile-tests">
- <echo>
- ${build.classes}
- </echo>
- <junit printsummary="yes" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${basedir}">
- <env key="LD_LIBRARY_PATH" value="${native}/srcNew/.libs" />
- <classpath refid="test.libraries" />
- <formatter type="plain" />
- <batchtest>
- <fileset dir="${build.classes}">
- <include name="**/test/PackageTests.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test1" depends="compile-tests">
- <echo>
- ${build.classes}
- </echo>
- <junit printsummary="yes" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${basedir}">
- <env key="LD_LIBRARY_PATH" value="/usr/local/lib" />
- <classpath refid="test.libraries" />
- <formatter type="plain" />
- <batchtest>
- <fileset dir="${build.classes}">
- <include name="**/test/PackageTests.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-</project>
+<project default="compile" basedir=".">
+
+ <target name="init">
+ <property name="distname" value="JuiCE"/>
+
+ <property name='product.Name' value='Apache JCE Provider for openSSL crypto library'/>
+ <property name='product.name' value='JuiCE'/>
+ <property name='product.shortname' value='juice'/>
+
+ <property name='product.version.major' value='0'/>
+ <property name='product.version.minor' value='9'/>
+ <property name='product.version.level' value='0'/>
+ <property name='product.Version' value='${product.version.major}.${product.version.minor}.${product.version.level}'/>
+ <property name='product.version' value='${product.version.major}.${product.version.minor}.${product.version.level}'/>
+ <property name='product_version' value='${product.version.major}_${product.version.minor}_${product.version.level}'/>
+ <property name="year" value="2006"/>
+ <property name="copyright" value="Copyright © ${year} Apache WS-Security Project. All Rights Reserved."/>
+
+
+ <!-- set global properties for this build -->
+ <property name="root" value="java"/>
+ <property name="src" value="${root}/src"/>
+ <property name="tests" value="${src}/test"/>
+ <property name="build.dir" value="./build"/>
+ <property name="build.classes" value="${build.dir}/classes"/>
+
+ <property name="native" value="./native"/>
+
+ <property name="dir.dist" value="./dist"/>
+ <property name="dir.libs" value="./lib"/>
+
+ <property name="build.doc" value="${build.dir}/doc"/>
+
+ <property name="jar.library" value="${product.shortname}.jar"/>
+
+
+ <path id="test.libraries" description="3rd party libs">
+ <fileset dir="${dir.dist}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${dir.libs}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement path="${build.classes}"/>
+ </path>
+ </target>
+
+ <target name="jar" depends="compile" description="Create the juice jar file" >
+ <jar jarfile="${dir.dist}/${jar.library}"
+ basedir="${build.classes}"
+ includes="**/apache/**/security/juice/**" />
+ </target>
+
+<!-- <target name="dist" depends="compile, headers" /> -->
+ <target name="bindist" depends="compile" description="Build zip file for distro">
+ <zip destfile=
+ "${dir.dist}/${product.shortname}-bin-${product.version}.zip">
+ <zipfileset prefix="juice" dir="."
+ includes="LICENSES/**, README.txt, juice-0.0.1.tar.gz, java/src/test/**" />
+ <zipfileset prefix="juice/classes" dir="${build.classes}"
+ includes="*.properties, test/**"/>
+<!-- <zipfileset prefix="juice/doc/api" dir="${build.javadoc}"/> -->
+ <zipfileset fullpath="juice/${jar.library}" dir="${dir.dist}"
+ includes="${jar.library}"/>
+ </zip>
+ </target>
+
+
+ <!-- Prepare directory structure for project build-->
+ <target name="prepare" depends="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${dir.dist}"/>
+ </target>
+
+ <!-- Compile classes and move them to ${build.classes} -->
+ <target name="compile" depends="prepare">
+ <javac srcdir="${src}" destdir="${build.classes}" includes="**/apache/**/*.java" excludes="**/jce/*.java" debug="on">
+ </javac>
+ </target>
+
+ <!-- Delete the ${build} and ${dist} directory trees -->
+ <target name="clean" depends="clean-build, clean-dist, clean-native"/>
+
+ <target name="clean-build">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <target name="clean-dist">
+ <delete dir="${dir.dist}"/>
+ </target>
+
+ <target name="clean-native">
+ </target>
+
+ <!-- Create C headers
+ <target name="headers">
+ <javah outputFile="${native}/src/juice.h" force="yes">
+ <class name="org.apache.security.jce.MD5"/>
+ <class name="org.apache.security.jce.SHA"/>
+ <class name="org.apache.security.jce.RSA"/>
+ <class name="org.apache.security.jce.SecureRandom"/>
+ <classpath refid="build.path"/>
+ </javah>
+ </target>
+ -->
+ <target name="compile-tests" depends="compile">
+ <javac srcdir="${src}" destdir="${build.classes}" includes="**/test/*.java" debug="on">
+ <classpath refid="test.libraries" />
+ </javac>
+ </target>
+
+ <target name="test" depends="compile-tests">
+ <echo>
+ ${build.classes}
+ </echo>
+ <junit printsummary="yes" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${basedir}">
+ <env key="LD_LIBRARY_PATH" value="${native}/src/.libs" />
+ <classpath refid="test.libraries" />
+ <formatter type="plain" />
+ <batchtest>
+ <fileset dir="${build.classes}">
+ <include name="**/test/PackageTests.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test1" depends="compile-tests">
+ <echo>
+ ${build.classes}
+ </echo>
+ <junit printsummary="yes" fork="yes" haltonfailure="yes" haltonerror="yes" dir="${basedir}">
+ <env key="LD_LIBRARY_PATH" value="/usr/local/lib" />
+ <classpath refid="test.libraries" />
+ <formatter type="plain" />
+ <batchtest>
+ <fileset dir="${build.classes}">
+ <include name="**/test/PackageTests.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+</project>
Modified: incubator/juice/configure.ac
URL: http://svn.apache.org/viewcvs/incubator/juice/configure.ac?rev=379404&r1=379403&r2=379404&view=diff
==============================================================================
--- incubator/juice/configure.ac (original)
+++ incubator/juice/configure.ac Tue Feb 21 01:57:18 2006
@@ -74,6 +74,6 @@
AC_CONFIG_FILES([Makefile
native/Makefile
- native/srcNew/Makefile])
+ native/src/Makefile])
AC_OUTPUT
Modified: incubator/juice/native/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/juice/native/Makefile.am?rev=379404&r1=379403&r2=379404&view=diff
==============================================================================
--- incubator/juice/native/Makefile.am (original)
+++ incubator/juice/native/Makefile.am Tue Feb 21 01:57:18 2006
@@ -1,3 +1,3 @@
## $Id$
-SUBDIRS = srcNew
+SUBDIRS = src
---------------------------------------------------------------------
To unsubscribe, e-mail: juice-svn-unsubscribe@xml.apache.org
For additional commands, e-mail: juice-svn-help@xml.apache.org