From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 12 Nov 2021 07:55:30 +0000 (+0100)
Subject: Working standalone build.
X-Git-Tag: argeo-commons-2.3.2~24
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=ffd153982b758faec9f21295dca1dd83076ac480

Working standalone build.
---

diff --git a/cnf/build.bnd b/cnf/build.bnd
index d5a7228bf..2882286b5 100644
--- 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 775759274..7a482932b 100644
--- 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