Working standalone build.

diff --git a/cnf/build.bnd b/cnf/build.bnd
index d5a7228bf23bdabb7e9c7aab9d175fd720e34a6a..2882286b551c77d4380067c2a9ca8cb809440644 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -9,7 +9,8 @@ buildId=D${tstamp}
 Bundle-Version: ${version.next}.${buildId}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*; *
--savemanifest = META-INF/MANIFEST.MF
+-savemanifest : META-INF/MANIFEST.MF
+-includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
 -compression STORE
 -source true
 -removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By

diff --git a/sdk/build.sh b/sdk/build.sh
index 7757592747683aa81e03a29c9cdaa2a7b807b6d8..7a482932b084ce8679f686d664661c4a8da87a4c 100644 (file)
--- a/sdk/build.sh
+++ b/sdk/build.sh
@@ -5,13 +5,25 @@ JVM=/usr/lib/jvm/jre-11/bin/java
 ECJ_JAR=/usr/share/java/ecj/ecj.jar
 OSGI_JAR=/usr/share/java/eclipse/osgi.jar
 
-
+echo PREPARING
 SOURCE_PATH=
 for bundle in ../*.*.*/ ; do
+echo $bundle
+# clean
+rm -rf $bundle/generated/*
+rm -rf $bundle/bin/*
+# copy resources
+rsync -r --exclude "*.java" $bundle/src/ $bundle/bin
 SOURCE_PATH="$SOURCE_PATH $bundle/src[-d $bundle/bin]"
 done
 
-echo ### COMPILATION ###
-time $JVM -jar $ECJ_JAR @ecj.args -time -cp $OSGI_JAR:"$(printf %s: target/sdk-*-a2-target/*/*.jar)" $SOURCE_PATH 
+echo COMPILING
+$JVM -jar $ECJ_JAR @ecj.args -time -cp $OSGI_JAR:"$(printf %s: target/sdk-*-a2-target/*/*.jar)" $SOURCE_PATH 
+
+echo PACKAGING
+bnd build
+
+mkdir -p target/a2/org.argeo.commons
+cp ../*/generated/*.jar target/a2/org.argeo.commons
 
-echo ### PACKAGING ###
+echo DONE
\ No newline at end of file