Skip to content

Commit

Permalink
Merge branch 'master' of github.com:YuukiARIA/LambdaMagica into mac-a…
Browse files Browse the repository at this point in the history
…pp-test
  • Loading branch information
YuukiARIA committed Oct 25, 2015
2 parents 3f25920 + 2f058ea commit 4e4873e
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 71 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: java
jdk:
- openjdk6
script:
- cd Lambda && ant junit
7 changes: 4 additions & 3 deletions Lambda/.classpath
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" output="classes/main" path="src"/>
<classpathentry kind="src" output="classes/test" path="test"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/junit.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions Lambda/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@

*.app
*~
/classes
169 changes: 101 additions & 68 deletions Lambda/build.xml
Original file line number Diff line number Diff line change
@@ -1,68 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Lambda Magica" basedir="." default="distribute">

<property name="version" value="3.82" />
<property name="product-name" value="lambda-magica-${version}" />

<property name="src" location="src" />
<property name="bin" location="bin" />
<property name="dist" value="lambda-magica" />
<property name="dir.dist" location="product" />

<property name="java.encoding" value="UTF-8" />
<property name="java.target.version" value="1.6" />
<property name="java.source.version" value="1.6" />

<property name="target-jar" value="lm.jar" />
<property name="dist-tgz" value="${product-name}.tar.gz" />
<property name="dist-zip" value="${product-name}.zip" />

<target name="mkdir">
<mkdir dir="${bin}" />
</target>

<target name="mkdir_dist">
<mkdir dir="${dist}" />
</target>

<target name="mkdir_product">
<mkdir dir="${dir.dist}" />
</target>

<target name="compile" depends="mkdir">
<javac srcdir="${src}" destdir="${bin}" encoding="${java.encoding}"
target="${java.target.version}" source="${java.source.version}"
includeantruntime="false" />
</target>

<target name="jar" depends="mkdir_dist,compile">
<jar destfile="${dist}/${target-jar}" basedir="${bin}" compress="true" update="false">
<manifest>
<attribute name="Main-Class" value="lambda.gui.Main" />
</manifest>
</jar>
</target>

<target name="dist" depends="mkdir_dist,mkdir_product,jar">
<tar tarfile="${dir.dist}/${dist-tgz}" compression="gzip">
<tarfileset dir="." includes="${dist}/*.sh,${dist}/*.bat" mode="755" />
<tarfileset dir="." includes="${dist}/**" excludes="**/*.sh,**/*.bat" />
</tar>
</target>

<target name="zip" depends="mkdir_dist,mkdir_product,jar">
<zip destfile="${dir.dist}/${dist-zip}" encoding="UTF-8">
<zipfileset dir="." includes="${dist}/*.sh,${dist}/*.bat" filemode="755" />
<zipfileset dir="." includes="${dist}/**" excludes="**/*.sh,**/*.bat" />
</zip>
</target>

<target name="distribute" depends="dist,zip">
</target>

<target name="clean">
<delete dir="${bin}" />
<delete file="${dist}/${target-jar}" />
</target>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<project name="Lambda Magica" basedir="." default="distribute">

<property name="version" value="3.82" />
<property name="product-name" value="lambda-magica-${version}" />

<property name="src" location="src" />
<property name="src.test" location="test" />
<property name="classes.main" location="classes/main" />
<property name="classes.test" location="classes/test" />
<property name="dist" value="lambda-magica" />
<property name="dir.dist" location="product" />

<property name="java.encoding" value="UTF-8" />
<property name="java.target.version" value="1.6" />
<property name="java.source.version" value="1.6" />

<property name="target-jar" value="lm.jar" />
<property name="dist-tgz" value="${product-name}.tar.gz" />
<property name="dist-zip" value="${product-name}.zip" />

<path id="test.classpath">
<pathelement location="${classes.main}" />
<pathelement location="./lib/junit.jar" />
<pathelement location="./lib/hamcrest-core.jar" />
</path>

<target name="mkdir">
<mkdir dir="${classes.main}" />
<mkdir dir="${classes.test}" />
</target>

<target name="mkdir_dist">
<mkdir dir="${dist}" />
</target>

<target name="mkdir_product">
<mkdir dir="${dir.dist}" />
</target>

<target name="compile" depends="mkdir">
<javac srcdir="${src}" destdir="${classes.main}" encoding="${java.encoding}"
target="${java.target.version}" source="${java.source.version}"
includeantruntime="false" />
</target>

<target name="compile-for-test" depends="mkdir,compile">
<javac srcdir="${src.test}" destdir="${classes.test}" encoding="${java.encoding}"
target="${java.target.version}" source="${java.source.version}"
includeantruntime="false">
<classpath refid="test.classpath" />
</javac>
</target>

<target name="jar" depends="mkdir_dist,compile">
<jar destfile="${dist}/${target-jar}" basedir="${classes.main}" compress="true" update="false">
<manifest>
<attribute name="Main-Class" value="lambda.gui.Main" />
</manifest>
</jar>
</target>

<target name="dist" depends="mkdir_dist,mkdir_product,jar">
<tar tarfile="${dir.dist}/${dist-tgz}" compression="gzip">
<tarfileset dir="." includes="${dist}/*.sh,${dist}/*.bat" mode="755" />
<tarfileset dir="." includes="${dist}/**" excludes="**/*.sh,**/*.bat" />
</tar>
</target>

<target name="zip" depends="mkdir_dist,mkdir_product,jar">
<zip destfile="${dir.dist}/${dist-zip}" encoding="UTF-8">
<zipfileset dir="." includes="${dist}/*.sh,${dist}/*.bat" filemode="755" />
<zipfileset dir="." includes="${dist}/**" excludes="**/*.sh,**/*.bat" />
</zip>
</target>

<target name="distribute" depends="dist,zip">
</target>

<target name="junit" depends="compile-for-test">
<junit haltonfailure="yes">
<formatter type="plain" usefile="false" />
<classpath>
<path refid="test.classpath" />
<pathelement location="${classes.test}" />
</classpath>
<batchtest>
<fileset dir="${classes.test}">
<include name="**/*.class" />
</fileset>
</batchtest>
</junit>
</target>

<target name="clean">
<delete dir="${classes.main}" />
<delete dir="${classes.test}" />
<delete file="${dist}/${target-jar}" />
</target>

</project>
Binary file added Lambda/lib/hamcrest-core.jar
Binary file not shown.
Binary file added Lambda/lib/junit.jar
Binary file not shown.
9 changes: 9 additions & 0 deletions Lambda/scripts/setup
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

PROJ_ROOT=$(dirname $0)/..
DIR_LIB=$PROJ_ROOT/lib

mkdir -p $DIR_LIB

wget http://search.maven.org/remotecontent?filepath=junit/junit/4.12/junit-4.12.jar -O $DIR_LIB/junit.jar
wget http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -O $DIR_LIB/hamcrest-core.jar

0 comments on commit 4e4873e

Please sign in to comment.