Revision: 3749
http://vexi.svn.sourceforge.net/vexi/?rev=3749&view=rev
Author: mkpg2
Date: 2009-11-09 01:35:53 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
Fix build on Mac OS X.
Modified Paths:
--------------
trunk/core/build.vexi.common/build_sign.ent
trunk/core/buildcore/build.conf.txt
trunk/core/buildcore/build.xml
trunk/core/buildcore/prep.xml
Removed Paths:
-------------
trunk/core/buildcore/antlib/proguard_out.jar
Modified: trunk/core/build.vexi.common/build_sign.ent
===================================================================
--- trunk/core/build.vexi.common/build_sign.ent 2009-11-09 01:31:10 UTC (rev
3748)
+++ trunk/core/build.vexi.common/build_sign.ent 2009-11-09 01:35:53 UTC (rev
3749)
@@ -1,6 +1,12 @@
<project name="Vexi Project Certification Task">
<property name="build.common.dir" location="../build.vexi.common/"/>
+ <!-- REMARK - be sure to add the bouncy castle provider (bcprov)
+ to the runtime classpath. It has to be the runtime classpath
+ and not directly included here because is a signed JCE provider
+ that for 'security reasons' can only be run from the
+ root class loader. -->
+
<taskdef name="VexiSign"
classname="vexitools.security.certify.ant.SignTask"
classpath="${build.common.dir}/lib_ant/ant-vexisign.jar"/>
Deleted: trunk/core/buildcore/antlib/proguard_out.jar
===================================================================
(Binary files differ)
Modified: trunk/core/buildcore/build.conf.txt
===================================================================
--- trunk/core/buildcore/build.conf.txt 2009-11-09 01:31:10 UTC (rev 3748)
+++ trunk/core/buildcore/build.conf.txt 2009-11-09 01:35:53 UTC (rev 3749)
@@ -24,3 +24,7 @@
### Location of the vexi signing directory (usually secret.vexi unless
### you are a different organisiation)
secret.dir=secret.xxx
+
+### Set this on platform where j2se classes not in $JAVA_HOME/lib/rt.jar
+### osx: bundle/Classes/classes.jar
+j2se_classes=
Modified: trunk/core/buildcore/build.xml
===================================================================
--- trunk/core/buildcore/build.xml 2009-11-09 01:31:10 UTC (rev 3748)
+++ trunk/core/buildcore/build.xml 2009-11-09 01:35:53 UTC (rev 3749)
@@ -135,13 +135,15 @@
</target>
<target name="buildcore" depends="parts" description="create
optimisable and non-optimisable jars">
+ <property name="j2se_classes" value="lib/rt.jar"/>
+
<!--optimize -->
<proguard>
-injars
${build_dir}/part_opt.jar(!org/ksoap2/**,!org/kobjects/**)
-outjars ${build_dir}/part_optO.jar
<!-- REMARK - Use multiple libraryjars options to get
around OS path separator difference (: vs. ;) -->
- -libraryjars <java.home>/lib/rt.jar
+ -libraryjars <java.home>/${j2se_classes}
-libraryjars ${build_dir}/part_noopt.jar
Modified: trunk/core/buildcore/prep.xml
===================================================================
--- trunk/core/buildcore/prep.xml 2009-11-09 01:31:10 UTC (rev 3748)
+++ trunk/core/buildcore/prep.xml 2009-11-09 01:35:53 UTC (rev 3749)
@@ -12,7 +12,8 @@
<target name="src_gen_all.init">
<property name="proj_target" value="src_gen"/>
</target>
- <target name="src_gen_all" depends="src_gen_all.init,org.vexi.devl"/>
+ <target name="src_gen_all" depends="src_gen_all.init,org.vexi.core"/>
+ <target name="src_gen_all_devl"
depends="src_gen_all.init,org.vexi.devl"/>
</project>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
