Add support for expansion.

git-svn-id: https://svn.java.net/svn/appbundler~svn@26 07572b26-92e5-4d45-f66a-c18421440a21

Author: gkbrown

appbundler/doc/appbundler.html

@@ -145,7 +145,8 @@ <h4>option</h4>
   </tr>
   <tr>
     <td valign="top">value</td>
-    <td valign="top">The option value.</td>
+    <td valign="top">The option value. Occurrences of the string "$APP_ROOT" will be replaced with
+    the absolute file system path to the application bundle.</td>
     <td align="center" valign="top">Yes</td>
   </tr>
 </table>
@@ -160,7 +161,8 @@ <h4>argument</h4>
   </tr>
   <tr>
     <td valign="top">value</td>
-    <td valign="top">The argument value.</td>
+    <td valign="top">The argument value. Occurrences of the string "$APP_ROOT" will be replaced with
+    the absolute file system path to the application bundle.</td>
     <td align="center" valign="top">Yes</td>
   </tr>
 </table>

appbundler/native/main.m

@@ -35,6 +35,8 @@
 #define JVM_OPTIONS_KEY "JVMOptions"
 #define JVM_ARGUMENTS_KEY "JVMArguments"
 
+#define APP_ROOT_PREFIX "$APP_ROOT"
+
 #define LIBJLI_DYLIB "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/lib/jli/libjli.dylib"
 
 typedef int (JNICALL *JLI_Launch_t)(int argc, char ** argv,
@@ -152,12 +154,14 @@ int launch(char *commandName) {
     argv[i++] = strdup([libraryPath UTF8String]);
 
     for (NSString *option in options) {
+        option = [option stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
         argv[i++] = strdup([option UTF8String]);
     }
 
     argv[i++] = strdup([mainClassName UTF8String]);
 
     for (NSString *argument in arguments) {
+        argument = [argument stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
         argv[i++] = strdup([argument UTF8String]);
     }
 

build.xml

@@ -27,11 +27,8 @@ questions.
 
 <project name="appbundler" default="package">
     <property environment="env"/>
-
     <property file="build.properties"/>
-
     <property name="folder.src" value="src"/>
-    <property name="folder.native" value="native"/>
     <property name="folder.bin" value="bin"/>
     <property name="folder.classes" value="${folder.bin}/classes"/>
 
@@ -63,7 +60,6 @@ questions.
             </fileset>
         </copy>
 
-        <!-- TODO Move this to a makefile so we can reference the defines required by JLI_Launch() -->
         <exec executable="gcc">
             <arg value="-I"/>
             <arg value="${env.JAVA_HOME}/include"/>