← Back to branch summary

~hypedyn-team/hypedyn/release-2.3

« back to all changes in this revision

Viewing changes to build/build.xml

  • Committer: alexm at edu
  • Date: 2014-08-15 08:02:47 UTC
  • Revision ID: alexm@nus.edu.sg-20140815080247-k9qsfitpq65up0ya
trying to fix appbundle on macos after switching to java 7: fixed file path inside app bundle for help and export, but run is broken on mac (should work on windows). Committing to test on Windows, then will fix running on both

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/build.xml
14
14
  <property name="version.local" value=""/>
15
15
  <property name="version" value="${version.release}${version.local}"/>
16
16
  
17
 
  <property name="kawa.dir"      value="/usr/local/share/java/"/>
 
17
  <property name="kawa.dir"      value="/usr/local/bin/"/>
18
18
 
19
19
  <property name="mac.javavm.framework"     value="/System/Library/Frameworks/JavaVM.framework/"/>
20
20
 
34
34
  <property name="reader-mainclass" value="${src.dir}/htreader.scm"/>
35
35
  <property name="applet-mainclass" value="${src.dir}/htapplet.scm"/>
36
36
 
37
 
  <property name="base.kawa.jar" value="kawa.jar"/>
 
37
  <property name="base.kawa.jar" value="kawa-1.14.jar"/>
38
38
        
39
39
  <property name="base.hypedyn.jar" value="hypedyn.jar"/>
40
40
  <property name="base.htapplet.jar" value="htapplet.jar"/>
70
70
  <fileset id="build.classes" dir="${temp.dir}">
71
71
     <include name="*.class"/>
72
72
  </fileset>
73
 
  
 
73
 
 
74
  <!-- for app bundler -->
 
75
  <property environment="env"/>
 
76
  <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"/>
 
77
 
74
78
  <!-- targets -->
75
79
  
76
80
  <!-- top most parent task -->
88
92
  <!-- <target name="dist" depends="dist-editor, dist-reader, dist-applet" /> -->
89
93
        
90
94
  <!-- note clean-dist and dist-common is only done once -->
91
 
  <target name="dist-editor" depends="dist-common, dist-editor-windows, dist-editor-linux, dist-editor-macosx" />
 
95
  <target name="dist-editor" depends="dist-common, dist-editor-windows, dist-editor-linux, dist-editor-macosx-new" />
92
96
  <target name="dist-reader" depends="dist-reader-windows, dist-reader-linux, dist-reader-macosx" />
93
97
  <target name="dist-applet" depends="dist-applet-common" />
94
98
   
136
140
         <property name="src.reader.standalone.package" value="${mac.package.dir}/HypeDynReader-standalone_package.app" />
137
141
        
138
142
        <!-- only used in macosx -->
139
 
     <condition property="dist.editor.package.javadir" value="${dist.editor.package}/Contents/Resources/Java" >
 
143
     <condition property="dist.editor.package.javadir" value="${dist.editor.package}/Contents/Java" >
140
144
        <istrue value="${macosx}"/> 
141
145
     </condition>
142
146
        <condition property="dist.reader.package.javadir" value="${dist.reader.package}/Contents/Resources/Java" >
360
364
  </target>
361
365
                
362
366
  <!-- Distribute Editor Mac -->
363
 
        
364
 
  <target name="dist-editor-macosx" if="macosx">
365
 
                                                        
366
 
        <!-- copy the jar files to the mac bundle -->
367
 
        <copy file="${build.hypedyn.jar}" todir="${dist.editor.package.javadir}"/>
368
 
        <copy file="${build.kawa.jar}" tofile="${dist.editor.package.javadir}/kawa.jar"/>
369
 
        <!-- rename to kawa.jar -->
370
 
        <!-- <move file="${dist.editor.package.javadir}/${base.kawa.jar}" tofile="${dist.editor.package.javadir}/kawa.jar" /> -->
371
 
        
372
 
        <!-- copy the mac bundle skeleton -->
373
 
        <copy todir="${dist.editor.package}">
374
 
           <fileset dir="${src.editor.package}"/>
375
 
        </copy>
376
 
        <chmod file="${dist.editor.package.appstub}" perm="a+x"/>
 
367
 
 
368
  <target name="dist-editor-macosx-new" if="macosx">
 
369
      <bundleapp outputdirectory="${dist.dir}"
 
370
                 name="HypeDyn"
 
371
                 displayname="HypeDyn"
 
372
                 identifier="org.narrativeandplay.hypedyn"
 
373
                 shortversion="2.3b rev 333"
 
374
                 applicationCategory="public.app-category.developer-tools"
 
375
                 icon="${mac.package.dir}/hypedyn.icns"
 
376
                 mainclassname="runhypedyn"
 
377
                 signature="Dyn1"
 
378
                 copyright="Copyright © 2008-2014 National University of Singapore and National University of Singapore. All rights reserved.">
 
379
          <runtime dir="${env.JAVA_HOME}"/>
 
380
          <classpath file="${build.hypedyn.jar}"/>
 
381
          <classpath file="${build.kawa.jar}"/>
 
382
          <option value="-Djava.library.path=$APP_ROOT/Contents/Java/" />
 
383
      </bundleapp>
377
384
 
378
385
        <!-- copy the help files -->
379
386
        <copy todir="${dist.editor.package.javadir}/help">