summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-05-15 17:46:30 -0400
committerStephan Herrmann2018-05-15 17:46:30 -0400
commit48f5a9c03f915e0e722d65e8fc3a5f783b0df7fd (patch)
tree1d93f7601a351cf29c60e05b3e54847321d11081
parent5efa719f1dc41994a85b6f91af4c728567cf5fb3 (diff)
downloadorg.eclipse.objectteams-48f5a9c03f915e0e722d65e8fc3a5f783b0df7fd.zip
org.eclipse.objectteams-48f5a9c03f915e0e722d65e8fc3a5f783b0df7fd.tar.gz
org.eclipse.objectteams-48f5a9c03f915e0e722d65e8fc3a5f783b0df7fd.tar.xz
Releng: new signing impl after Bug 521263 - Terminate CLI signing
service (aka /usr/bin/sign) - try to fix condition/sign/pack sequence
-rwxr-xr-xreleng/build-scripts/bin/createRepository-hipp.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/releng/build-scripts/bin/createRepository-hipp.sh b/releng/build-scripts/bin/createRepository-hipp.sh
index de43396..c92d7ab 100755
--- a/releng/build-scripts/bin/createRepository-hipp.sh
+++ b/releng/build-scripts/bin/createRepository-hipp.sh
@@ -98,14 +98,14 @@ NAME="Object Teams"
echo "LAUNCHER_PATH = ${LAUNCHER_PATH}"
echo "NAME = ${NAME}"
-echo "====Step 1: pack jars ===="
+echo "====Step 0: condition jars ===="
for dir in ${BASE}/testrun/updateSite/features ${BASE}/testrun/updateSite/plugins
do
find ${dir} -type f -name \*.jar -exec \
- ${JAVA8}/bin/java -jar ${JARPROCESSOR} -verbose -processAll -pack -outputDir ${dir} {} \;
+ ${JAVA8}/bin/java -jar ${JARPROCESSOR} -verbose -processAll -repack -outputDir ${dir} {} \;
done
-echo "====Step 2: request signing and zip===="
+echo "====Step 1: request signing and zip===="
cd ${BASE}/testrun/updateSite
JARS=`find . -type f -name \*.jar -o -name \*.jar.pack.gz`
OTDTJAR=${BASE}/testrun/otdt.jar
@@ -141,7 +141,7 @@ else
fi
-echo "====Step 3: fill new repository===="
+echo "====Step 2: fill new repository===="
if [ -r ${BASE}/stagingRepo ]
then
/bin/rm -rf ${BASE}/stagingRepo
@@ -165,6 +165,13 @@ LOCATION=${BASE}/stagingRepo
echo "LOCATION = ${LOCATION}"
cd ${LOCATION}
+echo "====Step 3: pack jars (again) ===="
+for dir in ${BASE}/testrun/updateSite/features ${BASE}/testrun/updateSite/plugins
+do
+ find ${dir} -type f -name \*.jar -exec \
+ ${JAVA8}/bin/java -jar ${JARPROCESSOR} -verbose -pack -outputDir ${dir} {} \;
+done
+
echo "====Step 4: generate metadata===="
java -jar ${LAUNCHER_PATH} -consoleLog -application ${FABPUB} \