From 6dc26cb368e82de0f0541659c349c453b568e199 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 9 Jan 2010 13:35:59 +0000 Subject: [PATCH] Update SDK git-svn-id: https://svn.argeo.org/slc/trunk@3258 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- buildSite.sh | 6 +++--- dist/org.argeo.slc.sdk/pom.xml | 16 ++++++++++++++++ dist/org.argeo.slc.sdk/src/assembly/dist.xml | 20 ++++++++++++++++---- dist/pom.xml | 4 +++- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/buildSite.sh b/buildSite.sh index ebe8b9dda..b83896c54 100755 --- a/buildSite.sh +++ b/buildSite.sh @@ -26,9 +26,9 @@ else fi # SDK -cd dist/org.argeo.slc.sdk -/usr/local/bin/mvn deploy -cd ../.. +#cd dist/org.argeo.slc.sdk +#/usr/local/bin/mvn deploy +#cd ../.. # SITE /usr/local/bin/mvn -up --fail-at-end site-deploy $PROFILES 2>&1 | tee siteGeneration.log diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml index 6099b57b8..98113caf5 100644 --- a/dist/org.argeo.slc.sdk/pom.xml +++ b/dist/org.argeo.slc.sdk/pom.xml @@ -33,6 +33,22 @@ + + org.argeo.maven.plugins + maven-argeo-osgi-plugin + true + + + pde-source + process-resources + + pde-sources + + + + + + maven-resources-plugin diff --git a/dist/org.argeo.slc.sdk/src/assembly/dist.xml b/dist/org.argeo.slc.sdk/src/assembly/dist.xml index f2053a474..8dd5df779 100644 --- a/dist/org.argeo.slc.sdk/src/assembly/dist.xml +++ b/dist/org.argeo.slc.sdk/src/assembly/dist.xml @@ -1,16 +1,28 @@ - + dist slc zip - + target/base + + ** + + + + target/libsrc + libsrc + + * + - + false diff --git a/dist/pom.xml b/dist/pom.xml index d8a782e99..21c424cb8 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -11,5 +12,6 @@ pom SLC Distribution + org.argeo.slc.sdk \ No newline at end of file -- 2.39.2