harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r390064 - in /incubator/harmony/enhanced/classlib/trunk/modules/security: ./ make/build.xml make/common/ make/common/build.xml make/common/hyproperties.xml make/download.xml
Date Thu, 30 Mar 2006 10:30:30 GMT
Author: tellison
Date: Thu Mar 30 02:30:29 2006
New Revision: 390064

URL: http://svn.apache.org/viewcvs?rev=390064&view=rev
Log:
Apply patch HARMONY-276 ([classlib][security] build files must be adjusted to common build
structure)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/download.xml
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security/   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/security/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 30 02:30:29 2006
@@ -1 +1,2 @@
 build
+bin

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml?rev=390064&r1=390063&r2=390064&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml Thu Mar 30 02:30:29
2006
@@ -16,521 +16,100 @@
     limitations under the License.
 -->
 
-<project name="HarmonySecurityBuild" default="dist" basedir="..">
+<project name="SECURITY Build" default="build" basedir="..">
+	<description>Build for SECURITY component</description>
 
-    <description> Build for Security stuff </description>
-
-
-
-    <!-- set global properties for this build. -->
-
-    <property name="build.compiler" value="modern"/>
-
-	<!--
-         In order to use Eclipse compiler you will need to add
-         the compiler's jars to the CLASSPATH and path to jni.h
-         to INCLUDE environment variables before build start.
-         For example:
-
-         set CLASSPATH=%ECLIPSE_HOME%/plugins/org.eclipse.jdt.core_3.0.1/jdtCompilerAdapter.jar;
\
-                 %ECLIPSE_HOME%/plugins/org.eclipse.jdt.core_3.0.1/jdtcore.jar;%CLASSPATH%
-
-         set INCLUDE=%MY_JVM%/include
-
-         property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"
-
-     -->
-
-    <property name="build.dir" value="."/>
-    <property name="build.path" location="${build.dir}/build" />
-    <property environment="env"/>
-
-
-    <condition property="if.win" value="true">
-        <os family="Windows" />
-    </condition>
-
-    <condition property="if.linux" value="true">
-        <and>
-            <os name="linux" />
-            <os family="unix" />
-        </and>
-    </condition>
-
-    <condition property="if.x86_64" value="true">
-        <contains string="${os.arch}" substring="x86_64"/>
-    </condition>
- 
-    <condition property="if.x86" value="true">
-        <and>
-          <contains string="${os.arch}" substring="86"/>
-            <not>
-               <isset property="if.x86_64"/>
-            </not>
-        </and>
-    </condition>
-
-
-    <condition property="if.ipf" value="true">
-        <contains string="${os.arch}" substring="ia64"/>
-    </condition>
-
-
-    <!-- Platform dependency -->
-
-    <target name="timestamp" description="Set up a timestamp">
-        <tstamp>
-            <format property="build-date" pattern="yyyyMMdd" locale="en" />
-        </tstamp>
-        <tstamp>
-            <format property="build-time" pattern="yyyyMMdd_HHmm)" />
-        </tstamp>
-        <echo message="build-date=${build-date}" />
-        <echo message="build-time=${build-time}" />
-        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-        <echo message="with java home = ${java.home} VM version = ${java.vm.version} vendor
= ${java.vm.vendor}" />
-    </target>
-
-    <target name="setname.win" if="if.win">
-        <property name="platform.name" value="win" />
-    </target>
-
-    <target name="setname.linux" if="if.linux">
-        <property name="platform.name" value="lnx" />
-    </target>
-
-
-    <!-- INIT TARGETS -->
-
-    <target name="init" depends="timestamp, setname.win, setname.linux">
-
-        <echo message="platform name=${platform.name}" />
-
-        <property name="java.debug.option" value="on" />
-        <property name="native.debug.option" value="on" />
-
-        <property name="src" location="${basedir}/src" />
-        <property name="src.common.java" location="${src}/common/javasrc" />
-        <property name="src.win.java" location="${src}/windows/javasrc" />
-        <property name="src.linux.java" location="${src}/linux/javasrc" />
-        <property name="src.tst" value="${basedir}/test" />
-        <property name="src.tst.common" value="${src.tst}/common" />
-
-        <property name="combined.path" value="deploy/jre"/>
-        <property name="build.lib.path" location="${build.path}/${combined.path}/lib"
/>
-        <property name="build.jars.path" location="${build.path}/${combined.path}/lib/boot"
/>
-        <property name="build.ext.path" location="${build.path}/${combined.path}/lib/ext"
/>
-        <property name="build.bin.path" location="${build.path}/${combined.path}/bin"
/>
-
-        <property name="tmp" location="${build.path}/tmp" />
-        <property name="source.ver" value="1.4" />
-
-        <echo message="if.x86_64=${if.x86_64}"/>
-        <echo message="if.x86=${if.x86}"/>
-        <echo message="if.ipf=${if.ipf}"/>
-
-        <echo message="create base dirs..." />
-        <mkdir dir="${build.path}" />
-        <mkdir dir="${tmp}" />
-        <mkdir dir="${build.lib.path}" />
-
-    </target>
-    
-    <target name="init.java_home">
-
-        <property name="JAVA_HOME" value="${env.JAVA_HOME}" />
-        <echo message="JAVA_HOME=${JAVA_HOME}"/>
-
-    </target>
-
-    <target name="init.win" depends="init, init.java_home" if="if.win">
-        <property name="src.java" value="${src.win.java}" />
-        <property name="src.tst.common.ps" value="${src.tst}/windows" />
-    </target>
-
-    
-    <target name="init.linux" depends="init, init.java_home" if="if.linux">
-        <property name="src.java" value="${src.linux.java}" />
-        <property name="src.tst.common.ps" value="${src.tst}/linux" />
-    </target>
-
-
-    <!-- SECURITY PACKAGES SETS -->
-
-    <patternset id="crypto">
-        <include name="javax/crypto/**"/>
-        <include name="org/apache/harmony/security/x/crypto/**"/>
-    </patternset>
-
-
-	<patternset id="security">
-		<include name="java/security/**"/>
-		<include name="javax/security/**"/>
-		<include name="org/apache/harmony/security/fortress/**"/>
-		<include name="org/apache/harmony/security/**"/>
-		<include name="org/apache/harmony/security/x/security/**"/>
-		<include name="org/apache/harmony/misc/Base64.*"/>
-		<include name="org/ietf/jgss/**"/>
-	</patternset>
-
-
-    <patternset id="x_net">
-        <include name="javax/net/**"/>
-    </patternset>
-
-
-    <patternset id="api.src.all">
-        <patternset refid="crypto"/>
-        <patternset refid="security"/>
-        <patternset refid="x_net"/>
-    </patternset>
-
-
-    <patternset id="unit.tests.src.all">
-        <include name="common/unit/org/apache/harmony/security/x/crypto/**"/>
-        <include name="common/unit/org/apache/harmony/sceurity/x/security/**"/>
-        <include name="common/unit/org/apache/harmony/security/**"/>
-        <include name="common/unit/org/apache/harmony/security/fortress/**"/>
-        <include name="common/unit/java/security/**"/>
-        <include name="common/unit/javax/crypto/**"/>
-        <include name="common/unit/javax/net/**"/>
-        <include name="common/unit/javax/security/**"/>
-        <include name="common/unit/org/ietf/jgss/**"/>
-        <include name="linux/unit/org/apache/harmony/security/x/security/**"/>
-        <include name="windows/unit/org/apache/harmony/security/x/security/**"/>
-    </patternset>
-
-
-    <!-- SECURITY TARGETS -->
-
-
-    <target name="dist" depends="init, init.win, init.linux, compile.api, build.jars,
copy.security"
-        description="Building Security binaries">
-        <!-- clean up -->
-        <delete dir="${tmp}"/>
-    </target>
-
-
-    <target name="tests" depends="dist, tests.compile"
-        description="Building Security tests">
-    </target>
-
-
-    <target name="tests.run" depends="tests, run"
-        description="Running Security tests">
-    </target>
-
-
-    <target name="tests.gen" depends="tests, gen_ser"
-        description="Generating serialized stuff for tests">
-    </target>
-
-    <target name="clean">
-        <delete dir="${build.path}"/>
-    </target>
-
-    <!-- SUPPORT TARGETS -->
-
-
-    <target name="build.jars">
-        <mkdir dir="${build.jars.path}"/>
-
-        <antcall target="build.one.jar">
-            <param name="ref.id" value="crypto"/>
-        </antcall>
-        <antcall target="build.one.jar">
-            <param name="ref.id" value="security"/>
-        </antcall>
-        <antcall target="build.one.jar">
-            <param name="ref.id" value="x_net"/>
-        </antcall>
-        <!-- build security.jar WITHOUT X500Principal class for tests run -->
-        <jar destfile="${build.path}/classes/security_alt.jar">
-            <fileset dir="${build.path}/classes">
-                <patternset refid="security"/>
-                <exclude name="javax/security/auth/x500/X500Principal.*" />
-            </fileset>
-        </jar>
-    </target>
-
-
-    <target name="compile.api" description="Compile Security API sources">
-        <mkdir dir="${build.path}/classes" />
-        <echo message="Compiling api classes from ${src.common.java}, ${src.java}" />
-        <javac sourcepath=""
-            destdir="${build.path}/classes"
-            source="${source.ver}"
-            debug="${java.debug.option}">
-            <src>
-                <pathelement location="${src.common.java}"/>
-                <pathelement location="${src.java}"/>
-            </src>
-            <patternset refid="api.src.all"/>
-            <bootclasspath>
-                <pathelement path="${build.path}/classes"/>
-                <fileset dir="${java.home}/lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-
-    <target name="build.one.jar">
-        <property name="jar.name" value="${ref.id}.jar"/>
-        <jar destfile="${build.jars.path}/${jar.name}">
-            <fileset dir="${build.path}/classes">
-                <patternset refid="${ref.id}"/>
-            </fileset>
-        </jar>
-    </target>
-
-
-    <target name="copy.security">
-        <mkdir dir="${build.ext.path}"/>
-
-        <!-- Copy java_home/lib/security -->
-        <copy todir="${build.lib.path}/security">
-            <fileset dir="${src}/java.home/lib/security"/>
-        </copy>
-
-    </target>
-
-
-    <target name="tests.compile">
-    	
-    	<!-- download the jars we need for testing and create a path -->
-
-    	<!--
-    	<ant antfile="make/download.xml" target="test-download" />
-    		
-    	<path id="sec.test.path">
-    		<fileset dir="${build.path}/lib">
-		        <include name="**/*.jar"/>
-		      </fileset>
-	     </path>
-    		
-    	<property name="test.deps.path" refid="sec.test.path" />
-        -->
-    	
-        <echo message="Compiling Security tests from ${src.tst.common}/unit, ${src.tst.common.ps}/unit"
/>
-    
-        <mkdir dir="${build.path}/tests" />
-
-        <javac srcdir="${src.tst.common}/unit;${src.tst.common.ps}/unit"
-               destdir="${build.path}/tests"
-               sourcepath=""
-               classpath="${env.CLASSPATH};${build.path}/tests;${test.deps.path}"
-               bootclasspath="${build.jars.path}/security.jar;${build.jars.path}/crypto.jar;${build.jars.path}/x_net.jar;${java.home}/lib/rt.jar"
-               source="${source.ver}"
-               debug="${java.debug.option}"
-        >
-
-        <include name="**/*.java"/>
-
-        </javac>
-    </target>
-
-    <target name="run">
-
-        <mkdir dir="${build.path}/tests_report" />
-
-    	<!-- run the tests -->
-    	
-        <junit fork="yes"
-            forkmode="perTest"
-            printsummary="withOutAndErr"
-            errorproperty="test.error"
-            showoutput="on"
-        	haltonfailure="on"
-            dir="${basedir}"
-            jvm="${env.JAVA_HOME}/bin/java">
- 
-        	<jvmarg value="-Xbootclasspath/p:${build.path}/classes/security_alt.jar${path.separator}${build.jars.path}/crypto.jar${path.separator}${build.jars.path}/x_net.jar"/>
-<!--            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${test.deps.path}"/>
-->
-            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${env.CLASSPATH}"/>
-            <jvmarg value="-Dreference.output=${src.tst.common}/unit" />
-            <jvmarg value="-Dunit.test.root=${src.tst.common}/unit"/>
-            <jvmarg value="-Djava.security.properties==${build.lib.path}/security/java.security"/>
-            <jvmarg value="-Djava.security.policy==${build.lib.path}/security/drl.policy"/>
-
-            <formatter type="plain" />
-            <batchtest todir="${build.path}/tests_report">
-                <fileset dir="${src.tst.common.ps}/unit">
-                    <include name="**/*Test*.java"/>
-                    <!-- Temp -->
-                    <exclude name="org/apache/harmony/security/x/security/auth/module/*LoginModuleTest.java"/>
-                </fileset>
-            </batchtest>
-            <batchtest todir="${build.path}/tests_report">
-                <fileset dir="${src.tst.common}/unit">
-                    <include name="**/*Test*.java"/>
-                    <!-- See README, Ch.5 -->
-                    <exclude name="javax/security/auth/x500/X500PrincipalTest.java" />
-                    <!-- Not a test -->
-                    <exclude name="org/apache/harmony/security/TestCertUtils.java"/>
-                    <exclude name="org/apache/harmony/security/TestKeyPair.java"/>
-                    <exclude name="org/apache/harmony/security/cert/TestUtils.java"/>
-                    <exclude name="org/apache/harmony/security/provider/cert/CertFactoryTestData.java"/>
-                    <exclude name="org/apache/harmony/security/test/**"/>
-
-                    <!-- 
-                    <exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
-                    <exclude name="javax/security/auth/SubjectTest.java"/>
-                    <exclude name="javax/security/auth/login/LoginContextTest.java"/>
-                    -->
-
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-	<!--                                                       -->
-	<!-- gen_ser : generates the serialized data for the       -->
-	<!--            serialization tests                        -->
-	<!--                                                       -->
-    <target name="gen_ser">
-
-        <mkdir dir="${build.path}/tests_report" />
-
-    	<!-- run the tests -->
-    	
-        <junit fork="yes"
-            forkmode="perTest"
-            printsummary="withOutAndErr"
-            errorproperty="test.error"
-            showoutput="on"
-        	haltonfailure="on"
-            dir="${basedir}"
-            jvm="${env.JAVA_HOME}/bin/java">
- 
-        	<jvmarg value="-Xbootclasspath/p:${build.path}/classes/security_alt.jar${path.separator}${build.jars.path}/crypto.jar${path.separator}${build.jars.path}/x_net.jar"/>
-<!--            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${test.deps.path}"/>
-->
-            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${env.CLASSPATH}"/>
-            <jvmarg value="-Dreference.output=${src.tst.common}/unit" />
-            <jvmarg value="-Dunit.test.root=${src.tst.common}/unit"/>
-            <jvmarg value="-Djava.security.properties==${build.lib.path}/security/java.security"/>
-            <jvmarg value="-Djava.security.policy==${build.lib.path}/security/drl.policy"/>
-			<jvmarg value="-Dtest.mode=serial.reference" />
-            <formatter type="plain" />
-        	
-        	<batchtest todir="${build.path}/tests_report">
-                <fileset dir="${src.tst.common}/unit">
-                    <include name="**/serialization/**/CodeSignerTest.java"/>
-                    <include name="**/serialization/**/CodeSourceTest.java"/>
-                    <include name="**/serialization/**/TimestampTest.java"/>
-                </fileset>
-            </batchtest>
-        	
-        </junit>
-    </target>
-
-	<!--                                                       -->
-	<!-- test.classlib : Running Security tests against the    -->
-	<!--                 Harmony classlib.  This also uses     -->
-	<!--                 the HarmonyVM (or whatever) found     -->
-    <!--                 at ../../deploy/jre                   -->
-	<!--                                                       -->
-
-    <target name="test.classlib" depends="tests"
-    	description="Running Security tests on Harmony classlib">
-
-        <mkdir dir="${build.path}/tests_report" />
-
-    	<property name="vm.home" location="${basedir}/../../deploy/jre" />
-
-        <junit fork="yes"
-            forkmode="perTest"
-            printsummary="withOutAndErr"
-            errorproperty="test.error"
-            showoutput="on"
-        	haltonfailure="on"
-            dir="${basedir}"
-            jvm="${vm.home}/bin/java">
-        	
-        	<env key="JAVA_HOME" value="${vm.home}"/>
-
-        	<!-- to pick up junit.jar and bouncycastle.jar -->
-            <jvmarg value="-Xbootclasspath/p:${build.jars.path}/crypto.jar${path.separator}${build.jars.path}/x_net.jar"/>
-            
-            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${env.CLASSPATH}"/>
-
-        	<jvmarg value="-Djava.security.properties==${build.lib.path}/security/java.security"/>
-            <jvmarg value="-Djava.security.policy==${build.lib.path}/security/drl.policy"/>
-        	<jvmarg value="-DTEST_SRC_DIR=${src.tst.common}/unit"/>
-
-            <formatter type="xml" />
-<!--            <batchtest todir="${build.path}/tests_report"> -->
-                <batchtest todir="${tests.output}">
-                <fileset dir="${src.tst.common.ps}/unit">
-                    <include name="**/*Test*.java"/>
-                </fileset>
-                <fileset dir="${src.tst.common}/unit">
-                    <include name="**/*Test*.java"/>
-
-                	<!-- Not a test -->
-                    <exclude name="org/apache/harmony/security/TestCertUtils.java"/>
-                    <exclude name="org/apache/harmony/security/TestKeyPair.java"/>
-                    <exclude name="org/apache/harmony/security/cert/TestUtils.java"/>
-                    <exclude name="org/apache/harmony/security/provider/cert/CertFactoryTestData.java"/>
-                    <exclude name="org/apache/harmony/security/test/**"/>
-                	
-                	<!-- Harmony exclude list -->
-                	<exclude name="java/security/AlgorithmParameterGenerator1Test.java"/>
-                	<exclude name="java/security/KSBuilderTest.java"/>
-                	<exclude name="java/security/KeyPairGenerator1Test.java"/>
-                	<exclude name="java/security/KeyPairGenerator3Test.java"/>
-                	<exclude name="java/security/KeyStore1Test.java"/>
-                	<exclude name="java/security/SignedObjectTest.java"/>
-                	<exclude name="java/security/cert/PKIXBuilderParametersTest.java"/>
-                	<exclude name="java/security/cert/PKIXParametersTest.java"/>
-                	<exclude name="java/security/cert/TrustAnchorTest.java"/>
-                	<exclude name="java/security/cert/X509CRLSelectorTest.java"/>
-                	<exclude name="java/security/cert/X509CertSelectorTest.java"/>
-                	<exclude name="java/security/serialization/KeyPairTest.java"/>
-                	<exclude name="java/security/serialization/SignedObjectTest.java"/>
-                	<exclude name="java/security/spec/DSAParameterSpecTest.java"/>
-                	<exclude name="java/security/spec/DSAPrivateKeySpecTest.java"/>
-                	<exclude name="java/security/spec/DSAPublicKeySpecTest.java"/>
-                	<exclude name="java/security/spec/ECFieldF2mTest.java"/>
-                	<exclude name="java/security/spec/ECFieldFpTest.java"/>
-                	<exclude name="java/security/spec/ECParameterSpecTest.java"/>
-                	<exclude name="java/security/spec/ECPointTest.java"/>
-                	<exclude name="java/security/spec/ECPrivateKeySpecTest.java"/>
-                	<exclude name="java/security/spec/ECPublicKeySpecTest.java"/>
-                	<exclude name="java/security/spec/EllipticCurveTest.java"/>
-                	<exclude name="java/security/spec/RSAKeyGenParameterSpecTest.java"/>
-                	<exclude name="java/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java"/>
-                	<exclude name="java/security/spec/RSAOtherPrimeInfoTest.java"/>
-                	<exclude name="java/security/spec/RSAPrivateCrtKeySpecTest.java"/>
-                	<exclude name="java/security/spec/RSAPrivateKeySpecTest.java"/>
-                	<exclude name="java/security/spec/RSAPublicKeySpecTest.java"/>
-                	<exclude name="javax/crypto/EncryptedPrivateKeyInfoTest.java"/>
-                	<exclude name="javax/crypto/KeyAgreementTest1.java"/>
-                	<exclude name="javax/crypto/spec/DHParameterSpecTest.java"/>
-                	<exclude name="javax/crypto/spec/DHPrivateKeySpecTest.java"/>
-                	<exclude name="javax/crypto/spec/DHPublicKeySpecTest.java"/>
-                	<exclude name="javax/security/auth/PrivateCredentialPermissionTest.java"/>
-                	<exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
-                	<exclude name="javax/security/auth/SubjectTest.java"/>
-                	<exclude name="javax/security/auth/login/LoginContextTest.java"/>
-                	<exclude name="javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java"/>
-                	<exclude name="javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java"/>
-                    <exclude name="javax/security/auth/x500/X500PrincipalTest.java" />
-                	<exclude name="javax/security/cert/X509CertificateTest.java"/>
-                	<exclude name="org/apache/harmony/security/asn1/der/BerInputStreamTest.java"/>
-                	<exclude name="org/apache/harmony/security/asn1/der/IntegerTest.java"/>
-                	<exclude name="org/apache/harmony/security/provider/cert/X509CRLImplTest.java"/>
-                	<exclude name="org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java"/>
-                	<exclude name="org/apache/harmony/security/provider/cert/X509CertFactoryPerfTest.java"/>
-                	<exclude name="org/apache/harmony/security/provider/cert/X509CertImplTest.java"/>
-                	<exclude name="org/apache/harmony/security/provider/cert/X509CertPathImplTest.java"/>
-                	<exclude name="org/apache/harmony/security/x509/CertificateListTest.java"/>
-                	<exclude name="org/apache/harmony/security/x509/CertificateTest.java"/>
-
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
+	<!-- set global properties for this build. -->
+	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+	<property environment="env"/>
+
+	<!-- Determine the (normalized) operating system family -->
+	<condition property="if.win">
+		<os family="Windows" />
+	</condition>
+	<condition property="hy.os_family" value="windows">
+		<isset property="if.win"/>
+	</condition>
+
+	<condition property="if.linux">
+		<and>
+			<os name="linux" />
+			<os family="unix" />
+		</and>
+	</condition>
+	<condition property="hy.os_family" value="linux">
+		<isset property="if.linux"/>
+	</condition>
+
+
+	<!-- Determine the (normalized) processor family -->
+	<condition property="if.x86_64">
+		<contains string="${os.arch}" substring="x86_64"/>
+	</condition>
+	<condition property="hy.cpu_family" value="x86_64">
+		<isset property="if.x86_64"/>
+	</condition>
+	
+	<condition property="if.x86">
+		<and>
+			<contains string="${os.arch}" substring="86"/>
+			<not>
+				<isset property="if.x86_64"/>
+			</not>
+		</and>
+	</condition>
+	<condition property="hy.cpu_family" value="x86">
+		<isset property="if.x86"/>
+	</condition>
+	
+	<condition property="if.ipf">
+		<contains string="${os.arch}" substring="ia64"/>
+	</condition>
+	<condition property="hy.cpu_family" value="ipf">
+		<isset property="if.ipf"/>
+	</condition>
+
+	<!-- Define the platform property dependant upon the OS and platform -->
+	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
+
+	<!-- Set the java compiler to be the Eclipse Java compiler -->
+	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+
+
+	<target name="init">
+		<tstamp>
+			<format property="build-date" pattern="yyyyMMdd" locale="en" />
+		</tstamp>
+		<tstamp>
+			<format property="build-time" pattern="yyyyMMdd_HHmm" />
+		</tstamp>
+		<echo message="build-date=${build-date}" />
+		<echo message="build-time=${build-time}" />
+		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+		<property name="java.debug.option" value="on" />
+		<property name="native.debug.option" value="on" />
+
+		<property name="source.ver" value="1.4" />
+	</target>
+	
+	<!-- SECURITY TARGETS -->
+
+	<target name="build" depends="init">
+		<ant dir="make/common" target="compile.java" />
+		<ant dir="make/common" target="build.jar" />
+		<ant dir="make/common" target="copy.resources" />
+	</target>
+
+
+	<target name="test" depends="build">
+		<ant dir="make/common" target="compile.tests" />
+		<ant dir="make/common" target="run.tests" />
+	</target>
+
+	<target name="clean">
+		<delete dir="${hy.security.bin.main}"/>
+		<delete dir="${hy.security.bin.test}"/>
+	</target>
 
 </project>

Added: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=390064&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Thu Mar
30 02:30:29 2006
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="Common_Security_Build">
+
+	<property name="hy.security.src.main.java.platform"
+		value="${hy.security.src.main.java}/../../${hy.os_family}/javasrc" />
+
+	<property name="hy.security.src.test.java.platform"
+		value="${hy.security.src.test.java}/../../${hy.os_family}/unit" />
+	
+	<target name="compile.java" description="Compile SECURITY java code">
+		<echo message="Compiling SECURITY classes from ${hy.security.src.main.java}" />
+		
+		<mkdir dir="${hy.security.bin.main}" />
+
+		<javac sourcepath=""
+			destdir="${hy.security.bin.main}"
+			source="${source.ver}"
+			debug="${java.debug.option}">
+
+			<src>
+				<pathelement location="${hy.security.src.main.java}"/>
+				<pathelement location="${hy.security.src.main.java.platform}"/>
+			</src>
+
+			<bootclasspath>
+				<fileset dir="${hy.target}/jre/lib/boot">
+					<include name="*.jar" />
+				</fileset>
+			</bootclasspath>
+		</javac>
+	</target>
+	
+	<target name="build.jar">
+		<jar destfile="${hy.target}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
+			manifest="${hy.security}/META-INF/MANIFEST.MF">
+			<fileset dir="${hy.security.bin.main}" />
+		</jar>
+	</target>
+
+	
+	<target name="compile.tests">
+		<echo message="Compiling SECURITY tests from ${hy.security.src.test.java}" />
+
+		<mkdir dir="${hy.security.bin.test}" />
+
+		<javac 	destdir="${hy.security.bin.test}"
+			source="${source.ver}"
+			sourcepath=""
+			debug="${java.debug.option}">
+
+			<src>
+				<pathelement location="${hy.security.src.test.java}"/>
+				<pathelement location="${hy.security.src.test.java.platform}"/>
+			</src>
+
+			<exclude name="org/apache/harmony/security/test/SecurityTest.java"/>
+			<exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
+			<exclude name="javax/security/auth/SubjectTest.java"/>
+			<exclude name="javax/security/auth/login/LoginContextTest.java"/>
+
+			<bootclasspath>
+				<fileset dir="${hy.target}/jre/lib/boot">
+					<include name="*.jar" />
+				</fileset>
+			</bootclasspath>
+		</javac>
+	</target>
+
+
+	<target name="run.tests">
+		
+	        <mkdir dir="${hy.tests.reports}" />
+
+	        <junit fork="yes"
+			forkmode="perTest"
+			printsummary="withOutAndErr"
+			errorproperty="test.error"
+			showoutput="on"
+			dir="${hy.security.bin.test}"
+			jvm="${hy.target}/jre/bin/java">
+
+			<!--jvmarg value="-showversion"/-->
+	        
+			<!-- Required for running the serialization unit tests -->
+			<!-- Note: will be deleted after improving             -->
+			<!-- SerializationTest support class: all resource     -->
+			<!-- files will be placed on the classpath             -->
+			<jvmarg value="-DTEST_SRC_DIR=${hy.security.src.test.java}"/>
+
+			<!-- to pick up junit.jar -->
+			<jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}${path.separator}${env.CLASSPATH}"/>
+
+			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+
+			<formatter type="xml" />
+
+			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
+				<fileset dir="${hy.security.src.test.java.platform}">
+					<include name="**/*Test.java"/>
+				</fileset>
+				<fileset dir="${hy.security.src.test.java}">
+					<include name="**/*Test.java"/>
+
+					<!-- Not a test -->
+					<exclude name="org/apache/harmony/security/TestCertUtils.java"/>
+					<exclude name="org/apache/harmony/security/TestKeyPair.java"/>
+					<exclude name="org/apache/harmony/security/cert/TestUtils.java"/>
+					<exclude name="org/apache/harmony/security/provider/cert/CertFactoryTestData.java"/>
+					<exclude name="org/apache/harmony/security/test/**"/>
+
+					<!-- Harmony exclude list -->
+					<exclude name="java/security/serialization/KeyPairTest.java"/>
+					<exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
+					<exclude name="javax/security/auth/SubjectTest.java"/>
+					<exclude name="javax/security/auth/login/LoginContextTest.java"/>
+					<exclude name="javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java"/>
+					<exclude name="javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java"/>
+					<exclude name="javax/security/auth/x500/X500PrincipalTest.java" />
+
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+	
+	
+	<target name="copy.resources">
+		<!-- Nothing for SECURITY -->
+	</target>
+</project>
+

Added: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml?rev=390064&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
Thu Mar 30 02:30:29 2006
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<hy>
+   <security location=".">
+      <src>
+         <main>
+            <java location="src/common/javasrc" />
+        	<resources location="src/main/resources" />
+         </main>
+         <test>
+            <java location="test/common/unit" />
+            <resources location="src/main/resources" />
+         </test>
+         <natives location="src/natives" />
+      </src>
+      <bin>
+        <main location="bin/main" />
+        <test location="bin/test" />
+      </bin>
+      <packaging>
+        <jarname>security</jarname>
+      </packaging>
+   </security>
+
+   <target location="../../deploy" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>



Mime
View raw message