Skip to content

Commit

Permalink
Removed custom compile scripts: as far as I know, they didn't work an…
Browse files Browse the repository at this point in the history
…yway.
  • Loading branch information
pipeep authored and johnduhart committed Apr 6, 2011
1 parent c0096a8 commit 3ea4aed
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 212 deletions.
6 changes: 0 additions & 6 deletions installer/build.xml
Expand Up @@ -16,8 +16,6 @@
<property name="sourceJNI-c" location="../cbc/CBCJVM/jni"/> <property name="sourceJNI-c" location="../cbc/CBCJVM/jni"/>
<property name="targetCode" location="${installData}/code"/> <property name="targetCode" location="${installData}/code"/>
<property name="sourceCode" location="../cbc/CBCJVM/examples/"/> <property name="sourceCode" location="../cbc/CBCJVM/examples/"/>
<property name="targetCompile" location="${installData}/compile"/>
<property name="sourceCompile" location="compile"/>


<target name="init" depends="clean" <target name="init" depends="clean"
description="initialize folder structure"> description="initialize folder structure">
Expand All @@ -29,7 +27,6 @@
<mkdir dir="${targetJNI-java}"/> <mkdir dir="${targetJNI-java}"/>
<mkdir dir="${targetJNI-c}"/> <mkdir dir="${targetJNI-c}"/>
<mkdir dir="${targetCode}"/> <mkdir dir="${targetCode}"/>
<mkdir dir="${targetCompile}"/>
</target> </target>


<target name="dist" depends="init" description="generate the distribution"> <target name="dist" depends="init" description="generate the distribution">
Expand All @@ -49,9 +46,6 @@
<copy todir="${targetCode}"> <copy todir="${targetCode}">
<fileset dir="${sourceCode}"/> <fileset dir="${sourceCode}"/>
</copy> </copy>
<copy todir="${targetCompile}">
<fileset dir="${sourceCompile}"/>
</copy>
</parallel> </parallel>
</target> </target>


Expand Down
101 changes: 0 additions & 101 deletions installer/compile/compile

This file was deleted.

101 changes: 0 additions & 101 deletions installer/compile/compile.sh

This file was deleted.

5 changes: 1 addition & 4 deletions installer/install/install_script_p2
Expand Up @@ -23,11 +23,8 @@ cp ./CBC.so /mnt/user/jvm/cbc/
cd /mnt/user cd /mnt/user
echo "[INSTALL] Removing JNI source..." echo "[INSTALL] Removing JNI source..."
rm -Rf /mnt/user/jvm/cbc/jni rm -Rf /mnt/user/jvm/cbc/jni
echo "[INSTALL] Remounting and copying compile script." echo "[INSTALL] Remounting..."
cd /mnt/user/compile
mount -o remount,rw /dev/sda2 mount -o remount,rw /dev/sda2
cp compile /mnt/kiss/usercode/
cd /mnt/user cd /mnt/user
rm -Rf compile
echo "[INSTALL] CBCJVM Installed!" echo "[INSTALL] CBCJVM Installed!"
echo "Please run the HelloWorld Program to verify." echo "Please run the HelloWorld Program to verify."

0 comments on commit 3ea4aed

Please sign in to comment.