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

Change GUI option to noGui (still not default) 

The Mac build didn't much like the previous setup, so I inverted the
condition and made sure the Mac bundle is disabled with noGui.
This commit is contained in:
T. Joseph Carter 2017-11-03 09:54:10 -07:00
parent c1caa1bc91
commit 30914c8efe
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/ACBuild-default.properties
View File

@ -9,11 +9,11 @@ antJarPathWin=C:/Java/lib/ant1.10.1/ant.jar
antJarPathMac=/opt/local/share/java/apache-ant/lib/ant.jar
antJarPathUnix=/usr/share/java/ant.jar
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
swtJarPathMac=/Users/Shared/Java/swt/swt.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
buildGui=true
#noGui=true

17
build/build.xml
View File

@ -71,8 +71,8 @@
<property name="antjar" value="${antJarPathMac}" />
<property name="swtjar" value="${swtJarPathMac}" />
<property name="juintjar" value="${junitPathMac}" />
<condition property="buildMacGui" value="true">
<istrue value="buildGui" />
<condition property="noMacGui" value="true">
<isset property="noGui" />
</condition>
</target>
@ -121,7 +121,7 @@
</signjar>
</target>
<target name="executableGuiJar" depends="init" if="buildGui"
<target name="executableGuiJar" depends="init" unless="noGui"
description="Build GUI executable JAR">
<javac srcdir="${source}" destdir="${classes}" classpath="${antjar}:${swtjar}">
<include name="**/*.java"/>
@ -141,9 +141,11 @@
</fileset>
</jar>
</target>
<target name="executableCmdJar" depends="init" description="Build command-line only executable JAR">
<javac srcdir="${source}" destdir="${classes}" classpath="${antjar}">
<target name="executableCmdJar" depends="init"
description="Build command-line only executable JAR">
<!-- SWT needs to be in classpath if executableGuiCmdJar didn't run -->
<javac srcdir="${source}" destdir="${classes}" classpath="${antjar}:${swtjar}">
<include name="**/*.java"/>
<exclude name="**/*Test.java"/>
<compilerarg value="-XDignore.symbol.file"/>
@ -165,8 +167,9 @@
</jar>
</target>
<target name="macBundle" depends="init,jars" if="buildMacGui"
<target name="macBundle" depends="init,jars" if="isMac" unless="noMacGui"
description="Build Mac application bundle.">
<echo>${isMac} ${noMacGui}</echo>
<property name="mac.dir" value="mac"/>
<property name="mac.app" value="${mac.dir}/AppleCommander.app"/>
<property name="mac.Contents" value="${mac.app}/Contents"/>