Skip to content

Commit

Permalink
make linux scripts more similar to windows
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.code.sf.net/p/lejos/code/trunk@6457 06c8f799-c779-4783-8af7-179afedb67c8
  • Loading branch information
skoehler committed Mar 13, 2012
1 parent 7cc9fb9 commit 5d16e77
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions scripts/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,24 @@ ${template.linux.parser}
<linux-run file="nxjc">
"$JAVAC" -bootclasspath "$NXJ_CP_NXT" -extdirs "" "$@"
</linux-run>
<!--
Version different to the windows script, with parser written in bash script
<linux-parser file="nxjpcc">
"$JAVAC" -classpath "$NXJ_CMDLINE_CP" "${NXJ_CMDLINE[@]}"
</linux-parser>
<linux-parser file="nxjpc">
"$JAVA" $NXJ_FORCE32 -Dnxj.home="$NXJ_HOME" -classpath "$NXJ_CMDLINE_CP" "${NXJ_CMDLINE[@]}"
"$JAVA" $NXJ_FORCE32 "-Dnxj.home=$NXJ_HOME" -classpath "$NXJ_CMDLINE_CP" "${NXJ_CMDLINE[@]}"
</linux-parser>
-->
<!--
Alternative version similar to the windows script, for testing purpose
-->
<linux-run file="nxjpcc">
"$JAVAC" "-Xbootclasspath/a:$NXJ_CP_PC" "$@"
</linux-run>
<linux-run file="nxjpc">
"$JAVA" $NXJ_FORCE32 -Dnxj.home="$NXJ_HOME" -Xbootclasspath/a:"$NXJ_CP_PC" "$@"
"$JAVA" $NXJ_FORCE32 "-Dnxj.home=$NXJ_HOME" "-Xbootclasspath/a:$NXJ_CP_PC" "$@"
</linux-run>
-->
</target>

<target name="windows" description="generated batch scripts">
Expand Down Expand Up @@ -149,10 +155,10 @@ ${template.linux.parser}
"%JAVAC%" -bootclasspath "%NXJ_CP_NXT%" -extdirs "" %*
</win-run>
<win-run file="nxjpcc">
"%JAVAC%" -Xbootclasspath/a:"%NXJ_CP_PC%" %*
"%JAVAC%" "-Xbootclasspath/a:%NXJ_CP_PC%" %*
</win-run>
<win-run file="nxjpc">
"%JAVA%" -Dnxj.home="%NXJ_HOME%" -Xbootclasspath/a:"%NXJ_CP_PC%" %*
"%JAVA%" -Dnxj.home="%NXJ_HOME%" "-Xbootclasspath/a:%NXJ_CP_PC%" %*
</win-run>
</target>

Expand Down

0 comments on commit 5d16e77

Please sign in to comment.