Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement packaging of the tool with IDEA artifacts #18

Merged
merged 2 commits into from
Mar 11, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .idea/artifacts/KaraExec_jar.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/artifacts/KaraLib_jar.xml

This file was deleted.

15 changes: 15 additions & 0 deletions .idea/artifacts/kara_core.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions .idea/artifacts/kara_dist.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/artifacts/kara_dist_zip.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/artifacts/kara_exec.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 1 addition & 36 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,43 +1,8 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="kara">
<target name="resolve" description="retrieve dependencies with ivy">
<!-- this is only used for manual libs update -->
<ivy:retrieve />
</target>

<property name="build.number" value="SNAPSHOT"/>
<target name="jars">
<delete dir="modules" failonerror="false"/>
<mkdir dir="modules"/>
<mkdir dir="modules/core"/>

<jar destfile="modules/KaraExec.jar" update="false">
<fileset dir="out/production/KaraExec">
<exclude name="**/script.kts"/>
</fileset>
</jar>
<zip destfile="modules/KaraExec-sources.zip" update="false">
<zipfileset dir="src/KaraExec/src"/>
</zip>

<jar destfile="modules/core/KaraLib.jar" update="false">
<fileset dir="out/production/KaraLib">
<exclude name="**/script.kts"/>
</fileset>
</jar>
<zip destfile="modules/core/KaraLib-sources.zip" update="false">
<zipfileset dir="src/KaraLib/src"/>
</zip>
</target>

<target name="dist" depends="jars" description="Binary Kara Distribution">
<zip destfile="${basedir}/kara-${build.number}.zip">
<zipfileset dir="lib" prefix="lib"/>
<zipfileset dir="license" prefix="license"/>
<zipfileset dir="modules" prefix="modules"/>
<zipfileset dir="samples" prefix="samples"/>
<zipfileset file="kara"/>
<zipfileset file="kara.bat"/>
<zipfileset file="README.md"/>
</zip>
</target>

</project>
3 changes: 1 addition & 2 deletions kara
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export KARA_HOME="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# get the jars needed for the classpath
JARS="$KARA_HOME/lib/*.jar"
CP_JARS="$KARA_HOME/modules/core/KaraLib.jar:$KARA_HOME/modules/KaraExec.jar"
CP_JARS=
for JAR in $JARS
do
case $JAR in
Expand All @@ -21,5 +21,4 @@ do
esac
done

#echo $CP_JARS
java -DKARA_HOME="$KARA_HOME" -classpath "$CP_JARS" kara.KaraPackage "$@"
4 changes: 0 additions & 4 deletions kara.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ set kara_home=%~dp0

set jars=%kara_home%lib\*.jar

set cp_jars=%kara_home%out\jars\KaraLib.jar;%kara_home%out\jars\KaraExec.jar


for %%j in (%jars%) do (
set cp_jars=%%j;!cp_jars!
)

set cp_jars=!cp_jars!

java -DKARA_HOME=%kara_home% -classpath %cp_jars% kara.KaraPackage %*