Skip to content

Commit 76677d5

Browse files
dghgitdghgit
committed
added util package
1 parent c2a8e69 commit 76677d5

2 files changed

Lines changed: 88 additions & 1 deletion

File tree

‎ant/bc+-build.xml‎

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
<property name="tls.target.docs.dir" value="${tls.target.dir}/javadoc" />
5050
<property name="tls.target.src.zip" value="${tls.target.dir}/src.zip" />
5151

52+
<property name="util.target" value="bcutil-${target.name}" />
53+
<property name="util.target.dir" value="${artifacts.dir}/${util.target}" />
54+
<property name="util.target.src.dir" value="${util.target.dir}/src" />
55+
<property name="util.target.docs.dir" value="${util.target.dir}/javadoc" />
56+
<property name="util.target.src.zip" value="${util.target.dir}/src.zip" />
57+
5258
<property name="lcrypto.target" value="lcrypto-${target.name}" />
5359
<property name="lcrypto.target.dir" value="${artifacts.dir}/${lcrypto.target}" />
5460
<property name="lcrypto.target.src.dir" value="${lcrypto.target.dir}/src" />
@@ -275,6 +281,7 @@
275281
<include name="org/bouncycastle/crypto/**/*.java" />
276282
<include name="org/bouncycastle/util/**/*.java" />
277283
<include name="org/bouncycastle/asn1/**/*.java" />
284+
<include name="org/bouncycastle/internal/**/*.java" />
278285
<include name="org/bouncycastle/pqc/crypto/**/*.java" />
279286
<include name="org/bouncycastle/pqc/math/**/*.java" />
280287
<include name="org/bouncycastle/pqc/asn1/**/*.java" />
@@ -318,11 +325,27 @@
318325
<exclude name="org/bouncycastle/**/AllTests.java" />
319326
<exclude name="org/bouncycastle/**/test/**" />
320327
<exclude name="org/bouncycastle/crypto/*/*Test.java" />
328+
<exclude name="org/bouncycastle/asn1/*/*Test.java" />
321329
<exclude name="org/bouncycastle/util/*Test.java" />
322330
<exclude name="org/bouncycastle/pqc/**/*Tests.java" />
323331
<exclude name="org/bouncycastle/pqc/**/LMSVectorUtils.java" />
324332
<exclude name="**/*.crl" />
325333
<exclude name="org/bouncycastle/util/utiltest/**" />
334+
<exclude name="org/bouncycastle/asn1/bsi/**" />
335+
<exclude name="org/bouncycastle/asn1/cmc/**" />
336+
<exclude name="org/bouncycastle/asn1/cmp/**" />
337+
<exclude name="org/bouncycastle/asn1/cms/**" />
338+
<exclude name="org/bouncycastle/asn1/crmf/**" />
339+
<exclude name="org/bouncycastle/asn1/dvcs/**" />
340+
<exclude name="org/bouncycastle/asn1/eac/**" />
341+
<exclude name="org/bouncycastle/asn1/esf/**" />
342+
<exclude name="org/bouncycastle/asn1/ess/**" />
343+
<exclude name="org/bouncycastle/asn1/est/**" />
344+
<exclude name="org/bouncycastle/asn1/icao/**" />
345+
<exclude name="org/bouncycastle/asn1/isismtt/**" />
346+
<exclude name="org/bouncycastle/asn1/its/**" />
347+
<exclude name="org/bouncycastle/asn1/smime/**" />
348+
<exclude name="org/bouncycastle/asn1/tsp/**" />
326349
<exclude name="org/bouncycastle/bcpg/**" />
327350
<exclude name="org/bouncycastle/cert/**" />
328351
<exclude name="org/bouncycastle/cms/**" />
@@ -621,6 +644,63 @@
621644

622645
</target>
623646

647+
<!--
648+
Utility Classes
649+
-->
650+
<target name="build-util" depends="initMacros">
651+
<mkdir dir="${util.target.dir}" />
652+
653+
<copyStandardFiles toDir="${util.target.dir}" />
654+
655+
<copy todir="${util.target.src.dir}">
656+
<fileset dir="${src.dir}">
657+
<exclude name="**/*Test.java" />
658+
<exclude name="**/*Tests.java" />
659+
<exclude name="**/test/*.java" />
660+
<include name="org/bouncycastle/asn1/bsi/**" />
661+
<include name="org/bouncycastle/asn1/cmc/**" />
662+
<include name="org/bouncycastle/asn1/cmp/**" />
663+
<include name="org/bouncycastle/asn1/cms/**" />
664+
<include name="org/bouncycastle/asn1/crmf/**" />
665+
<include name="org/bouncycastle/asn1/dvcs/**" />
666+
<include name="org/bouncycastle/asn1/eac/**" />
667+
<include name="org/bouncycastle/asn1/esf/**" />
668+
<include name="org/bouncycastle/asn1/ess/**" />
669+
<include name="org/bouncycastle/asn1/est/**" />
670+
<include name="org/bouncycastle/asn1/icao/**" />
671+
<include name="org/bouncycastle/asn1/isismtt/**" />
672+
<include name="org/bouncycastle/asn1/its/**" />
673+
<include name="org/bouncycastle/asn1/smime/**" />
674+
<include name="org/bouncycastle/asn1/tsp/**" />
675+
</fileset>
676+
</copy>
677+
678+
<compile target="${util.target}">
679+
<jarFileSet>
680+
<exclude name="**/test/*.class" />
681+
<include name="**/*.class"/>
682+
<include name="**/*.properties"/>
683+
</jarFileSet>
684+
<manifestElements>
685+
<attribute name="Manifest-Version" value="1.0" />
686+
<attribute name="Extension-Name" value="org.bouncycastle.bcutil" />
687+
<attribute name="Specification-Vendor" value="BouncyCastle.org" />
688+
<attribute name="Specification-Version" value="1.1" />
689+
<attribute name="Implementation-Vendor-Id" value="org.bouncycastle" />
690+
<attribute name="Implementation-Vendor" value="BouncyCastle.org" />
691+
<attribute name="Implementation-Version" value="${release.version}.0" />
692+
<attribute name="Application-Name" value="Bouncy Castle Utility APIs" />
693+
<attribute name="Trusted-Library" value="true" />
694+
<attribute name="Permissions" value="all-permissions" />
695+
<attribute name="Codebase" value="*" />
696+
<attribute name="Application-Library-Allowable-Codebase" value="*" />
697+
<attribute name="Caller-Allowable-Codebase" value="*" />
698+
<attribute name="Automatic-Module-Name" value="org.bouncycastle.util" />
699+
</manifestElements>
700+
</compile>
701+
702+
</target>
703+
624704
<target name="build-pkix" depends="initMacros">
625705
<mkdir dir="${pkix.target.dir}" />
626706

@@ -871,7 +951,7 @@
871951
<include name="org/bouncycastle/ocsp/**/test/*.java" />
872952
<include name="org/bouncycastle/crypto/**/test/*.java" />
873953
<include name="org/bouncycastle/crypto/**/test/cavp/*.java" />
874-
<include name="org/bouncycastle/asn1/**/test/*.java" />
954+
<include name="org/bouncycastle/asn1/test/*.java" />
875955
<include name="org/bouncycastle/crypto/**/*.html" />
876956
<include name="org/bouncycastle/math/**/*.html" />
877957
<include name="org/bouncycastle/asn1/**/*.html" />

‎ant/jdk15+.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
<fileset dir="pg/src/test/java" includes="**/*.java" />
5757
<fileset dir="pg/src/test/resources" includes="**/*.*" />
5858

59+
<fileset dir="util/src/main/java" includes="**/*.java" />
60+
<fileset dir="util/src/main/javadoc" includes="**/*.html" />
61+
<fileset dir="util/src/main/java" includes="**/*.properties" />
62+
<fileset dir="util/src/test/java" includes="**/*.java" />
63+
<fileset dir="util/src/test/resources" includes="**/*.*" />
64+
5965
<fileset dir="mail/src/main/java" includes="**/*.java" />
6066
<fileset dir="mail/src/main/javadoc" includes="**/*.html" />
6167
<fileset dir="mail/src/main/resources" includes="**/*.properties" />
@@ -94,6 +100,7 @@
94100
</target>
95101

96102
<target name="build" depends="init">
103+
<ant antfile="ant/bc+-build.xml" dir="." target="build-util" />
97104
<ant antfile="ant/bc+-build.xml" dir="." target="build-tls" />
98105
<ant antfile="ant/bc+-build.xml" dir="." />
99106
<ant antfile="ant/bc+-build.xml" dir="." target="javadoc-lw" />

0 commit comments

Comments
 (0)