Skip to content
Browse files

Merge pull request #18 from jonnyzzz/jars

Implement packaging of the tool with IDEA artifacts
  • Loading branch information...
2 parents 30cc4f1 + f4b8b3e commit 926d1e0d60dbc5acb338a37b2101e3d09be36f25 @ajselvig ajselvig committed Mar 11, 2013
View
8 .idea/artifacts/KaraExec_jar.xml
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
- <artifact type="jar" build-on-make="true" name="KaraExec:jar">
- <output-path>$PROJECT_DIR$/modules</output-path>
- <root id="archive" name="KaraExec.jar">
- <element id="module-output" name="KaraExec" />
- </root>
- </artifact>
-</component>
View
8 .idea/artifacts/KaraLib_jar.xml
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
- <artifact type="jar" build-on-make="true" name="KaraLib:jar">
- <output-path>$PROJECT_DIR$/modules/core</output-path>
- <root id="archive" name="KaraLib.jar">
- <element id="module-output" name="KaraLib" />
- </root>
- </artifact>
-</component>
View
15 .idea/artifacts/kara_core.xml
@@ -0,0 +1,15 @@
+<component name="ArtifactManager">
+ <artifact name="kara-core">
+ <output-path>$PROJECT_DIR$/out/artifacts/kara_core</output-path>
+ <root id="root">
+ <element id="archive" name="kara-core.jar">
+ <element id="module-output" name="KaraLib" />
+ </element>
+ <element id="directory" name="src">
+ <element id="archive" name="kara-core-src.zip">
+ <element id="dir-copy" path="$PROJECT_DIR$/src/KaraLib/src" />
+ </element>
+ </element>
+ </root>
+ </artifact>
+</component>
View
31 .idea/artifacts/kara_dist.xml
@@ -0,0 +1,31 @@
+<component name="ArtifactManager">
+ <artifact name="kara-dist">
+ <output-path>$PROJECT_DIR$/out/artifacts/kara_dist</output-path>
+ <root id="root">
+ <element id="file-copy" path="$PROJECT_DIR$/kara.bat" />
+ <element id="file-copy" path="$PROJECT_DIR$/kara" />
+ <element id="file-copy" path="$PROJECT_DIR$/README.md" />
+ <element id="directory" name="lib">
+ <element id="library" level="project" name="javax.servlet-3.0.0.v201112011016" />
+ <element id="library" level="project" name="jackson-core-asl-1.9.9" />
+ <element id="library" level="project" name="jetty-all-server-8.1.5.v20120716" />
+ <element id="library" level="project" name="javassist-3.12.1.GA" />
+ <element id="library" level="project" name="jackson-mapper-asl-1.9.9" />
+ <element id="library" level="project" name="guava-11.0.2" />
+ <element id="library" level="project" name="slf4j-log4j12-1.6.6" />
+ <element id="library" level="project" name="slf4j-api-1.6.6" />
+ <element id="library" level="project" name="reflections-0.9.8" />
+ <element id="library" level="project" name="log4j-1.2.17" />
+ <element id="library" level="project" name="KotlinRuntime" />
+ <element id="artifact" artifact-name="kara-core" />
+ <element id="artifact" artifact-name="kara-exec" />
+ </element>
+ <element id="directory" name="samples">
+ <element id="dir-copy" path="$PROJECT_DIR$/samples/KaraDemo" />
+ </element>
+ <element id="directory" name="licenses">
+ <element id="dir-copy" path="$PROJECT_DIR$/license" />
+ </element>
+ </root>
+ </artifact>
+</component>
View
10 .idea/artifacts/kara_dist_zip.xml
@@ -0,0 +1,10 @@
+<component name="ArtifactManager">
+ <artifact name="kara-dist-zip">
+ <output-path>$PROJECT_DIR$/out/artifacts/kara_dist_zip</output-path>
+ <root id="root">
+ <element id="archive" name="kara.zip">
+ <element id="artifact" artifact-name="kara-dist" />
+ </element>
+ </root>
+ </artifact>
+</component>
View
15 .idea/artifacts/kara_exec.xml
@@ -0,0 +1,15 @@
+<component name="ArtifactManager">
+ <artifact name="kara-exec">
+ <output-path>$PROJECT_DIR$/out/artifacts/kara_exec</output-path>
+ <root id="root">
+ <element id="directory" name="src">
+ <element id="archive" name="kara-exex-src.zip">
+ <element id="dir-copy" path="$PROJECT_DIR$/src/KaraExec/src" />
+ </element>
+ </element>
+ <element id="archive" name="kara-exec.jar">
+ <element id="module-output" name="KaraExec" />
+ </element>
+ </root>
+ </artifact>
+</component>
View
37 build.xml
@@ -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>
View
3 kara
@@ -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
@@ -21,5 +21,4 @@ do
esac
done
-#echo $CP_JARS
java -DKARA_HOME="$KARA_HOME" -classpath "$CP_JARS" kara.KaraPackage "$@"
View
4 kara.bat
@@ -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 %*
-

0 comments on commit 926d1e0

Please sign in to comment.
Something went wrong with that request. Please try again.