Apple-2-Tools
/
AppleCommander
mirror of https://github.com/AppleCommander/AppleCommander.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add unix build conditionals 

Previously AC built onm Windows or not Windows (assumed to be Mac).
It appears there was a means to build using gcj, but this is not
necessary, does not work anymore as configured, and isn't what we want
anyway.

Here's a first pass at improving that situation.  It's a bit ugly at
present because it requires a lot of markup to do something that should
be simple.  Still, I'd rather do this in steps.
This commit is contained in:
T. Joseph Carter 2017-11-03 07:50:28 -07:00
parent f683bfc24c
commit 117fe87cd9
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/ACBuild-default.properties
View File

@ -7,7 +7,9 @@
#
swtJarPathWin=C:/Program Files/Eclipse 2.1.x/plugins/org.eclipse.swt.win32_2.1.3/ws/win32/swt.jar
swtJarPathMac=/Users/Shared/eclipse/plugins/org.eclipse.swt.carbon.macosx_3.3.3.v3349.jar
swtJarPathUnix=/usr/share/java/swt.jar
junitPathWin=C:/Java/lib/junit3.8.1/junit.jar
junitPathMac=/Users/Shared/eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar
junitPathUnix=/usr/share/java/junit.jar
keyconf=${user.home}/.secret
alias=name
alias=name

47
build/build.xml Normal file → Executable file
View File

@ -15,16 +15,41 @@
<property name="builddir" value="${basedir}/build" />
<property file="${builddir}/ACBuild.properties"/>
<property file="${builddir}/ACBuild-default.properties"/>
<condition property="swtjar"
value="${swtJarPathWin}"
else="${swtJarPathMac}">
<os family="windows"/>
</condition>
<condition property="junitjar"
value="${junitPathWin}"
else="${junitPathMac}">
<os family="windows"/>
</condition>
<condition property="isWin" value="true">
<os family="windows" />
</condition>
<condition property="isMac" value="true">
<and>
<os family="mac" />
<os family="unix" />
</and>
</condition>
<condition property="isUnix" value="true">
<and>
<os family="unix" />
<not>
<os family="mac" />
</not>
</and>
</condition>
<condition property="swtjar" value="${swtJarPathWin}">
<isset property="isWin" />
</condition>
<condition property="swtjar" value="${swtJarPathMac}">
<isset property="isMac" />
</condition>
<condition property="swtjar" value="${swtJarPathUnix}">
<isset property="isUnix" />
</condition>
<condition property="juintjar" value="${junitPathWin}">
<isset property="isWin" />
</condition>
<condition property="juintjar" value="${junitPathMac}">
<isset property="isMac" />
</condition>
<condition property="juintjar" value="${junitPathUnix}">
<isset property="isUnix" />
</condition>
<condition property="signing-needed">
<available file="${keyconf}" property="keyconf-exists" />
</condition>
@ -203,4 +228,4 @@
<zipfileset dir="${javadoc}" prefix="javadoc"/>
</zip>
</target>
</project>
</project>