summaryrefslogtreecommitdiffstats
path: root/maven
diff options
context:
space:
mode:
authorMark Raynsford <[email protected]>2014-03-11 20:54:50 +0000
committerMark Raynsford <[email protected]>2014-03-11 20:54:50 +0000
commit75322060978ed360ebf3ad355abd915e868c92a4 (patch)
tree63115d7efbcb942feee43b94424fa9ea914ad946 /maven
parentf538477c6467f046533b3fc584566dccc768c6f5 (diff)
Massively rewrite project handling. Projects are now defined by directories of
(mostly) single-line config files (essentially a glorified directory-based key/value db). The scripts have been adjusted to work better in isolation (in particular the old copy-jars script has been split into a copy-jars-one and copy-jars script, with the latter executing the former on all projects). Bug 999: Is now fixed. Essentially a variable name was accidentally re-used, meaning the source zip file was copied over the project's main jar file. The -n option was passed to cp, but not the subsequent mv, so the overwrite occurred silently!
Diffstat (limited to 'maven')
-rwxr-xr-xmaven/make-copy-jars-one.sh154
-rwxr-xr-xmaven/make-copy-jars.sh116
-rwxr-xr-xmaven/make-copy-poms.sh2
-rwxr-xr-xmaven/make-deploy-one.sh3
-rwxr-xr-xmaven/make-deploy.sh15
-rwxr-xr-xmaven/make-directories.sh2
-rwxr-xr-xmaven/make-list-projects.sh2
-rwxr-xr-xmaven/make-pom-one.sh17
-rwxr-xr-xmaven/make-poms.sh8
-rw-r--r--maven/make-projects.txt31
-rw-r--r--maven/projects/gluegen-rt-android/atomics1
-rw-r--r--maven/projects/gluegen-rt-android/dummy-jar1
-rw-r--r--maven/projects/gluegen-rt-android/natives1
-rwxr-xr-xmaven/projects/gluegen-rt-android/pom.sh (renamed from maven/gluegen-rt-android.pom.sh)4
-rw-r--r--maven/projects/gluegen-rt-android/source-zip1
-rw-r--r--maven/projects/gluegen-rt-main/atomics1
-rw-r--r--maven/projects/gluegen-rt-main/dummy-jar1
-rw-r--r--maven/projects/gluegen-rt-main/natives1
-rwxr-xr-xmaven/projects/gluegen-rt-main/pom.sh (renamed from maven/gluegen-rt-main.pom.sh)8
-rw-r--r--maven/projects/gluegen-rt-main/source-zip1
-rw-r--r--maven/projects/gluegen-rt/atomics1
-rw-r--r--maven/projects/gluegen-rt/dummy-jar1
-rw-r--r--maven/projects/gluegen-rt/natives1
-rwxr-xr-xmaven/projects/gluegen-rt/pom.sh (renamed from maven/gluegen-rt.pom.sh)4
-rw-r--r--maven/projects/gluegen-rt/source-zip1
-rw-r--r--maven/projects/gluegen/atomics1
-rw-r--r--maven/projects/gluegen/dummy-jar1
-rw-r--r--maven/projects/gluegen/natives1
-rw-r--r--maven/projects/gluegen/pom.in (renamed from maven/gluegen.pom.in)2
-rwxr-xr-xmaven/projects/gluegen/pom.sh (renamed from maven/gluegen.pom.sh)4
-rw-r--r--maven/projects/gluegen/source-zip1
-rw-r--r--maven/projects/joal-android/atomics1
-rw-r--r--maven/projects/joal-android/dummy-jar1
-rw-r--r--maven/projects/joal-android/natives1
-rwxr-xr-xmaven/projects/joal-android/pom.sh (renamed from maven/joal-android.pom.sh)4
-rw-r--r--maven/projects/joal-android/source-zip1
-rw-r--r--maven/projects/joal-main/atomics1
-rw-r--r--maven/projects/joal-main/dummy-jar1
-rw-r--r--maven/projects/joal-main/natives1
-rwxr-xr-xmaven/projects/joal-main/pom.sh (renamed from maven/joal-main.pom.sh)9
-rw-r--r--maven/projects/joal-main/source-zip1
-rw-r--r--maven/projects/joal/atomics1
-rw-r--r--maven/projects/joal/dummy-jar1
-rw-r--r--maven/projects/joal/natives1
-rw-r--r--maven/projects/joal/pom.in (renamed from maven/joal.pom.in)2
-rwxr-xr-xmaven/projects/joal/pom.sh (renamed from maven/joal.pom.sh)4
-rw-r--r--maven/projects/joal/source-zip1
-rw-r--r--maven/projects/jocl-android/atomics1
-rw-r--r--maven/projects/jocl-android/dummy-jar1
-rw-r--r--maven/projects/jocl-android/natives1
-rwxr-xr-xmaven/projects/jocl-android/pom.sh (renamed from maven/jocl-android.pom.sh)4
-rw-r--r--maven/projects/jocl-android/source-zip1
-rw-r--r--maven/projects/jocl-main/atomics1
-rw-r--r--maven/projects/jocl-main/dummy-jar1
-rw-r--r--maven/projects/jocl-main/natives1
-rwxr-xr-xmaven/projects/jocl-main/pom.sh (renamed from maven/jocl-main.pom.sh)9
-rw-r--r--maven/projects/jocl-main/source-zip1
-rw-r--r--maven/projects/jocl/atomics1
-rw-r--r--maven/projects/jocl/dummy-jar1
-rw-r--r--maven/projects/jocl/natives1
-rw-r--r--maven/projects/jocl/pom.in (renamed from maven/jocl.pom.in)2
-rwxr-xr-xmaven/projects/jocl/pom.sh (renamed from maven/jocl.pom.sh)4
-rw-r--r--maven/projects/jocl/source-zip1
-rw-r--r--maven/projects/jogl-all-android/atomics1
-rw-r--r--maven/projects/jogl-all-android/dummy-jar1
-rw-r--r--maven/projects/jogl-all-android/natives1
-rwxr-xr-xmaven/projects/jogl-all-android/pom.sh (renamed from maven/jogl-all-android.pom.sh)4
-rw-r--r--maven/projects/jogl-all-android/source-zip1
-rw-r--r--maven/projects/jogl-all-main/atomics1
-rw-r--r--maven/projects/jogl-all-main/dummy-jar1
-rw-r--r--maven/projects/jogl-all-main/natives1
-rwxr-xr-xmaven/projects/jogl-all-main/pom.sh (renamed from maven/jogl-all-main.pom.sh)8
-rw-r--r--maven/projects/jogl-all-main/source-zip1
-rw-r--r--maven/projects/jogl-all-mobile-main/atomics1
-rw-r--r--maven/projects/jogl-all-mobile-main/dummy-jar1
-rw-r--r--maven/projects/jogl-all-mobile-main/natives1
-rwxr-xr-xmaven/projects/jogl-all-mobile-main/pom.sh (renamed from maven/jogl-all-mobile-main.pom.sh)8
-rw-r--r--maven/projects/jogl-all-mobile-main/source-zip1
-rw-r--r--maven/projects/jogl-all-mobile/atomics1
-rw-r--r--maven/projects/jogl-all-mobile/dummy-jar1
-rw-r--r--maven/projects/jogl-all-mobile/natives1
-rwxr-xr-xmaven/projects/jogl-all-mobile/pom.sh (renamed from maven/jogl-all-mobile.pom.sh)4
-rw-r--r--maven/projects/jogl-all-mobile/source-zip1
-rw-r--r--maven/projects/jogl-all-noawt-main/atomics1
-rw-r--r--maven/projects/jogl-all-noawt-main/dummy-jar1
-rw-r--r--maven/projects/jogl-all-noawt-main/natives1
-rwxr-xr-xmaven/projects/jogl-all-noawt-main/pom.sh (renamed from maven/jogl-all-noawt-main.pom.sh)8
-rw-r--r--maven/projects/jogl-all-noawt-main/source-zip1
-rw-r--r--maven/projects/jogl-all-noawt/atomics1
-rw-r--r--maven/projects/jogl-all-noawt/dummy-jar1
-rw-r--r--maven/projects/jogl-all-noawt/natives1
-rwxr-xr-xmaven/projects/jogl-all-noawt/pom.sh (renamed from maven/jogl-all-noawt.pom.sh)4
-rw-r--r--maven/projects/jogl-all-noawt/source-zip1
-rw-r--r--maven/projects/jogl-all/atomics1
-rw-r--r--maven/projects/jogl-all/dummy-jar1
-rw-r--r--maven/projects/jogl-all/natives1
-rwxr-xr-xmaven/projects/jogl-all/pom.sh (renamed from maven/jogl-all.pom.sh)4
-rw-r--r--maven/projects/jogl-all/source-zip1
-rw-r--r--maven/projects/jogl/atomics1
-rw-r--r--maven/projects/jogl/dummy-jar1
-rw-r--r--maven/projects/jogl/natives1
-rw-r--r--maven/projects/jogl/pom.in (renamed from maven/newt.pom.in)2
-rwxr-xr-xmaven/projects/jogl/pom.sh (renamed from maven/jogl.pom.sh)4
-rw-r--r--maven/projects/jogl/source-zip1
-rw-r--r--maven/projects/nativewindow/atomics1
-rw-r--r--maven/projects/nativewindow/dummy-jar1
-rw-r--r--maven/projects/nativewindow/natives1
-rw-r--r--maven/projects/nativewindow/pom.in (renamed from maven/nativewindow.pom.in)2
-rwxr-xr-xmaven/projects/nativewindow/pom.sh (renamed from maven/nativewindow.pom.sh)4
-rw-r--r--maven/projects/nativewindow/source-zip1
-rw-r--r--maven/projects/newt/atomics1
-rw-r--r--maven/projects/newt/dummy-jar1
-rw-r--r--maven/projects/newt/natives1
-rw-r--r--maven/projects/newt/pom.in (renamed from maven/jogl.pom.in)2
-rwxr-xr-xmaven/projects/newt/pom.sh (renamed from maven/newt.pom.sh)4
-rw-r--r--maven/projects/newt/source-zip1
116 files changed, 322 insertions, 226 deletions
diff --git a/maven/make-copy-jars-one.sh b/maven/make-copy-jars-one.sh
new file mode 100755
index 0000000..a53a813
--- /dev/null
+++ b/maven/make-copy-jars-one.sh
@@ -0,0 +1,154 @@
+#!/bin/sh
+
+info()
+{
+ echo "make-copy-jars-one: info: ${NAME}: $1" 1>&2
+}
+
+copy()
+{
+ SOURCE="$1"
+ TARGET="$2"
+
+ info "copy $1 $2.tmp" 1>&2
+ cp -n "$1" "$2.tmp" || exit 1
+ info "rename $2.tmp $2" 1>&2
+ mv -n "$2.tmp" "$2" || exit 1
+}
+
+if [ $# -ne 2 ]
+then
+ info "usage: project version"
+ exit 1
+fi
+
+NAME="$1"
+shift
+VERSION="$1"
+shift
+
+INPUT="input/jogamp-all-platforms"
+
+if [ ! -d "${INPUT}" ]
+then
+ echo "make-copy-jars-one: error: ${INPUT} is not an existing directory" 1>&2
+ echo "make-copy-jars-one: error: unpack jogamp-all-platforms.7z into 'input'" 1>&2
+ exit 1
+fi
+
+if [ ! -d "projects/${NAME}" ]
+then
+ echo "make-copy-jars-one: error: unknown project ${NAME}" 1>&2
+ exit 1
+fi
+
+# Produce platform list
+PLATFORMS=`cat make-platforms.txt | awk '{print $1}'` || exit 1
+
+# Keep a list of all files copied, for deployment later
+MANIFEST_FILE="output/${NAME}/${VERSION}/manifest.txt"
+
+#------------------------------------------------------------------------
+# Copy all native jars, if necessary
+#
+
+NATIVES=`cat projects/${NAME}/natives` || exit 1
+if [ "${NATIVES}" = "natives" ]
+then
+ info "natives: ${NATIVES}"
+
+ for PLATFORM in ${PLATFORMS}
+ do
+ OUTPUT_NAME="${NAME}-${VERSION}-natives-${PLATFORM}.jar"
+ SOURCE="${INPUT}/jar/${NAME}-natives-${PLATFORM}.jar"
+ TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
+ copy "${SOURCE}" "${TARGET}"
+ echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
+ done
+else
+ if [ "${NATIVES}" = "atomic-natives" ]
+ then
+ info "natives: ${NATIVES}"
+
+ for PLATFORM in ${PLATFORMS}
+ do
+ OUTPUT_NAME="${NAME}-${VERSION}-natives-${PLATFORM}.jar"
+ SOURCE="${INPUT}/jar/atomic/${NAME}-natives-${PLATFORM}.jar"
+ TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
+ copy "${SOURCE}" "${TARGET}"
+ echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
+ done
+ else
+ info "natives: not required"
+ fi
+fi
+
+#------------------------------------------------------------------------
+# Copy dummy code jars, if necessary.
+#
+
+DUMMY=`cat projects/${NAME}/dummy-jar` || exit 1
+if [ "${DUMMY}" = "dummy-jar" ]
+then
+ info "dummy-jar: required"
+ OUTPUT_NAME="${NAME}.jar"
+ SOURCE="empty.jar"
+else
+ info "dummy-jar: not required (copying main jar)"
+ # Copy main jar
+ OUTPUT_NAME="${NAME}.jar"
+ SOURCE="${INPUT}/jar/${OUTPUT_NAME}"
+fi
+TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
+copy "${SOURCE}" "${TARGET}"
+echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
+
+#------------------------------------------------------------------------
+# Copy dummy source code jars, if necessary
+#
+
+SRC_ZIP=`cat projects/${NAME}/source-zip` || exit 1
+if [ "${SRC_ZIP}" = "dummy-src" ]
+then
+ info "source-zip: dummy source zip required"
+ OUTPUT_NAME="${NAME}-${VERSION}-sources.jar"
+ SOURCE="empty.jar"
+else
+ info "source-zip: ${INPUT}/${SRC_ZIP}"
+ OUTPUT_NAME="${NAME}-${VERSION}-sources.jar"
+ SOURCE="${INPUT}/${SRC_ZIP}"
+fi
+TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
+copy "${SOURCE}" "${TARGET}"
+echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
+
+#------------------------------------------------------------------------
+# Copy dummy jars to 'javadoc' jars, as we don't publish real versions of these yet.
+#
+
+OUTPUT_NAME="${NAME}-${VERSION}-javadoc.jar"
+SOURCE="empty.jar"
+TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
+copy "${SOURCE}" "${TARGET}"
+echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
+
+#------------------------------------------------------------------------
+# Copy atomics, if necessary
+#
+
+ATOMICS=`cat projects/${NAME}/atomics` || exit 1
+if [ ! -z "${ATOMICS}" ]
+then
+ info "atomics: ${ATOMICS}"
+ for ATOMIC in ${ATOMICS}
+ do
+ JAR_NAME="${NAME}-${VERSION}-${ATOMIC}.jar"
+ SOURCE="${INPUT}/jar/atomic/${NAME}-${ATOMIC}.jar"
+ TARGET="output/${NAME}/${VERSION}/${JAR_NAME}"
+ copy "${SOURCE}" "${TARGET}"
+ echo "${JAR_NAME}" >> "${MANIFEST_FILE}"
+ done
+else
+ info "atomics: no atomics required"
+fi
+
diff --git a/maven/make-copy-jars.sh b/maven/make-copy-jars.sh
index 6ad63ab..03927da 100755
--- a/maven/make-copy-jars.sh
+++ b/maven/make-copy-jars.sh
@@ -5,17 +5,6 @@ info()
echo "make-copy-jars: info: $1" 1>&2
}
-copy()
-{
- SOURCE="$1"
- TARGET="$2"
-
- info "copy $1 $2.tmp" 1>&2
- cp -n "$1" "$2.tmp" || exit 1
- info "rename $2.tmp $2" 1>&2
- mv "$2.tmp" "$2" || exit 1
-}
-
if [ $# -ne 1 ]
then
info "usage: version"
@@ -34,110 +23,11 @@ then
exit 1
fi
-PROJECTS=`./make-list-projects.sh` || exit 1
+PROJECTS=`ls projects` || exit 1
PLATFORMS=`cat make-platforms.txt | awk '{print $1}'` || exit 1
-IFS="
-"
-
-for PROJECT_LINE in ${PROJECTS}
+for PROJECT in ${PROJECTS}
do
- # Determine project name
- NAME=`echo "${PROJECT_LINE}" | awk -F: '{print $1}'` || exit 1
- NAME=`echo "${NAME}" | tr -d ' '` || exit 1
-
- # Determine whether or not the project has native jars
- NATIVES=`echo "${PROJECT_LINE}" | awk -F: '{print $2}'` || exit 1
- NATIVES=`echo "${NATIVES}" | tr -d ' '` || exit 1
-
- # Determine whether or not the project uses an empty "dummy" jar
- DUMMY=`echo "${PROJECT_LINE}" | awk -F: '{print $3}'` || exit 1
- DUMMY=`echo "${DUMMY}" | tr -d ' '` || exit 1
-
- # Determine the source zip file, may be dummy-src
- SRC_ZIP=`echo "${PROJECT_LINE}" | awk -F: '{print $4}'` || exit 1
- SRC_ZIP=`echo "${SRC_ZIP}" | tr -d ' '` || exit 1
-
- # Determine whether or not the project has atomic jars
- ATOMICS=`echo "${PROJECT_LINE}" | awk -F: '{print $5}'` || exit 1
-
- # Keep a list of all files copied, for deployment later
- MANIFEST_FILE="output/${NAME}/${VERSION}/manifest.txt"
-
- # Copy all native jars, if necessary
- if [ "${NATIVES}" = "natives" ]
- then
- for PLATFORM in ${PLATFORMS}
- do
- OUTPUT_NAME="${NAME}-${VERSION}-natives-${PLATFORM}.jar"
- SOURCE="${INPUT}/jar/${NAME}-natives-${PLATFORM}.jar"
- TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
- copy "${SOURCE}" "${TARGET}"
- echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
- done
- else
- if [ "${NATIVES}" = "atomic-natives" ]
- then
- for PLATFORM in ${PLATFORMS}
- do
- OUTPUT_NAME="${NAME}-${VERSION}-natives-${PLATFORM}.jar"
- SOURCE="${INPUT}/jar/atomic/${NAME}-natives-${PLATFORM}.jar"
- TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
- copy "${SOURCE}" "${TARGET}"
- echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
- done
- fi
- fi
-
- # Copy dummy jar, if necessary
- if [ "${DUMMY}" = "dummy-jar" ]
- then
- OUTPUT_NAME="${NAME}.jar"
- SOURCE="empty.jar"
- else
- # Copy main jar
- OUTPUT_NAME="${NAME}.jar"
- SOURCE="${INPUT}/jar/${OUTPUT_NAME}"
- fi
- TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
- copy "${SOURCE}" "${TARGET}"
- echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
-
- # Copy dummy jars, if necessary
- if [ "${SRC_ZIP}" = "dummy-src" ]
- then
- OUTPUT_NAME="${NAME}-${VERSION}-sources.jar"
- SOURCE="empty.jar"
- else
- SOURCE="${INPUT}/${SRC_ZIP}"
- fi
- TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
- copy "${SOURCE}" "${TARGET}"
- echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
-
- # Copy dummy jars to 'javadoc' jars, as we
- # don't publish real versions of these yet.
- OUTPUT_NAME="${NAME}-${VERSION}-javadoc.jar"
- SOURCE="empty.jar"
- TARGET="output/${NAME}/${VERSION}/${OUTPUT_NAME}"
- copy "${SOURCE}" "${TARGET}"
- echo "${OUTPUT_NAME}" >> "${MANIFEST_FILE}"
-
- # Copy atomics, if necessary
- if [ ! -z "${ATOMICS}" ]
- then
- info "atomics: ${ATOMICS}"
- IFS=" "
- for ATOMIC in ${ATOMICS}
- do
- JAR_NAME="${NAME}-${VERSION}-${ATOMIC}.jar"
- SOURCE="${INPUT}/jar/atomic/${NAME}-${ATOMIC}.jar"
- TARGET="output/${NAME}/${VERSION}/${JAR_NAME}"
- copy "${SOURCE}" "${TARGET}"
- echo "${JAR_NAME}" >> "${MANIFEST_FILE}"
- done
- IFS="
-"
- fi
+ ./make-copy-jars-one.sh "${PROJECT}" "${VERSION}" || exit 1
done
diff --git a/maven/make-copy-poms.sh b/maven/make-copy-poms.sh
index 44e5e06..3c026b8 100755
--- a/maven/make-copy-poms.sh
+++ b/maven/make-copy-poms.sh
@@ -25,7 +25,7 @@ fi
VERSION="$1"
shift
-PROJECTS=`./make-list-projects.sh | awk -F: '{print $1}'` || exit 1
+PROJECTS=`ls projects` || exit 1
for PROJECT in ${PROJECTS}
do
diff --git a/maven/make-deploy-one.sh b/maven/make-deploy-one.sh
index 40c2e3a..5b60137 100755
--- a/maven/make-deploy-one.sh
+++ b/maven/make-deploy-one.sh
@@ -36,9 +36,6 @@ DEPLOY_FILES=""
DEPLOY_CLASSIFIERS=""
DEPLOY_TYPES=""
-IFS="
-"
-
for LINE in `cat manifest.txt`
do
if [ "${LINE}" = "${NAME}.jar" ]
diff --git a/maven/make-deploy.sh b/maven/make-deploy.sh
index 5d6d21d..497b69d 100755
--- a/maven/make-deploy.sh
+++ b/maven/make-deploy.sh
@@ -14,22 +14,11 @@ fi
VERSION="$1"
shift
-PROJECTS=`./make-list-projects.sh` || exit 1
+PROJECTS=`ls projects` || exit 1
PLATFORMS=`cat make-platforms.txt | awk '{print $1}'` || exit 1
-CURRENT_DIR=`pwd` || exit 1
-
-# Set internal field separator to newlines so that ${PROJECTS} is
-# tokenized per-line.
-IFS="
-"
-
-for PROJECT_LINE in ${PROJECTS}
+for NAME in ${PROJECTS}
do
- # Determine project name
- NAME=`echo "${PROJECT_LINE}" | awk -F: '{print $1}'` || exit 1
- NAME=`echo "${NAME}" | tr -d ' '` || exit 1
-
./make-deploy-one.sh "${NAME}" "${VERSION}"
done
diff --git a/maven/make-directories.sh b/maven/make-directories.sh
index f0404e9..6339d45 100755
--- a/maven/make-directories.sh
+++ b/maven/make-directories.sh
@@ -9,7 +9,7 @@ fi
VERSION="$1"
shift
-PROJECTS=`./make-list-projects.sh | awk -F: '{print $1}'` || exit 1
+PROJECTS=`ls projects` || exit 1
for PROJECT in ${PROJECTS}
do
diff --git a/maven/make-list-projects.sh b/maven/make-list-projects.sh
deleted file mode 100755
index b932926..0000000
--- a/maven/make-list-projects.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec grep -v '^#' make-projects.txt
diff --git a/maven/make-pom-one.sh b/maven/make-pom-one.sh
new file mode 100755
index 0000000..c1e2c43
--- /dev/null
+++ b/maven/make-pom-one.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]
+then
+ echo "make-pom-one: usage: project version" 1>&2
+ exit 1
+fi
+
+PROJECT="$1"
+shift
+VERSION="$1"
+shift
+
+PLATFORMS=`cat make-platforms.txt | awk '{print $1}'` || exit 1
+
+cd "projects/${PROJECT}" || exit 1
+exec ./pom.sh "${VERSION}" ${PLATFORMS}
diff --git a/maven/make-poms.sh b/maven/make-poms.sh
index 568e840..b42d56e 100755
--- a/maven/make-poms.sh
+++ b/maven/make-poms.sh
@@ -9,12 +9,12 @@ fi
VERSION="$1"
shift
-PROJECTS=`./make-list-projects.sh | awk -F: '{print $1}'` || exit 1
+PROJECTS=`ls projects` || exit 1
for PROJECT in ${PROJECTS}
do
- echo "make-poms: info: generating pom for ${PROJECT}" 1>&2
- "./${PROJECT}.pom.sh" "${VERSION}" > "output/${PROJECT}.pom.tmp" || exit 1
- mv "output/${PROJECT}.pom.tmp" "output/${PROJECT}.pom" || exit 1
+ echo "make-poms: info: generating pom for ${PROJECT}" 1>&2
+ ./make-pom-one.sh "${PROJECT}" "${VERSION}" > "output/${PROJECT}.pom.tmp" || exit 1
+ mv -n "output/${PROJECT}.pom.tmp" "output/${PROJECT}.pom" || exit 1
done
diff --git a/maven/make-projects.txt b/maven/make-projects.txt
deleted file mode 100644
index a38eec5..0000000
--- a/maven/make-projects.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Lines prefixed with '#' are considered comments and ignored.
-#
-# project-name : natives? : use-dummy-jar? : source-jar-name? : atomics?
-#
-# Where:
-# natives := "natives" | "no-natives" | "atomic-natives"
-# use-dummy-jar := "no-dummy-jar" | "dummy-jar"
-# source-jar-name := "dummy-src" | name
-# atomics := name*
-#
-gluegen : no-natives : no-dummy-jar : gluegen-java-src.zip :
-gluegen-rt : natives : no-dummy-jar : gluegen-java-src.zip :
-gluegen-rt-android : no-natives : no-dummy-jar : gluegen-java-src.zip :
-gluegen-rt-main : no-natives : dummy-jar : dummy-src :
-joal : natives : no-dummy-jar : joal-java-src.zip :
-joal-android : no-natives : no-dummy-jar : joal-java-src.zip :
-joal-main : no-natives : dummy-jar : dummy-src :
-jocl-android : no-natives : no-dummy-jar : jocl-java-src.zip :
-jocl : natives : no-dummy-jar : jocl-java-src.zip :
-jocl-main : no-natives : dummy-jar : dummy-src :
-jogl : no-natives : dummy-jar : jogl-java-src.zip : awt core fonts-p0 gldesktop gldesktop-dbg glmobile glmobile-dbg glu glu-gldesktop omx os-android os-osx os-win os-x11 sdk swt util-awt util-fixedfuncemu util-gldesktop util-graph util
-jogl-all : natives : no-dummy-jar : jogl-java-src.zip :
-jogl-all-android : no-natives : no-dummy-jar : jogl-java-src.zip :
-jogl-all-main : no-natives : dummy-jar : dummy-src :
-jogl-all-mobile : no-natives : no-dummy-jar : jogl-java-src.zip :
-jogl-all-mobile-main : no-natives : dummy-jar : dummy-src :
-jogl-all-noawt : no-natives : no-dummy-jar : jogl-java-src.zip :
-jogl-all-noawt-main : no-natives : dummy-jar : dummy-src :
-nativewindow : atomic-natives : dummy-jar : dummy-src : awt core os-osx os-win os-x11
-newt : atomic-natives : dummy-jar : dummy-src : awt core driver-android driver-bcm-old driver-bcm-vc driver-intelgdl driver-kd driver-linux driver-osx driver-win driver-x11 event ogl swt
diff --git a/maven/projects/gluegen-rt-android/atomics b/maven/projects/gluegen-rt-android/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/gluegen-rt-android/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/gluegen-rt-android/dummy-jar b/maven/projects/gluegen-rt-android/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/gluegen-rt-android/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/gluegen-rt-android/natives b/maven/projects/gluegen-rt-android/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/gluegen-rt-android/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/gluegen-rt-android.pom.sh b/maven/projects/gluegen-rt-android/pom.sh
index fc5bfdb..7994e96 100755
--- a/maven/gluegen-rt-android.pom.sh
+++ b/maven/projects/gluegen-rt-android/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat gluegen.pom.in || exit 1
+cat ../gluegen/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/gluegen-rt-android/source-zip b/maven/projects/gluegen-rt-android/source-zip
new file mode 100644
index 0000000..3847c62
--- /dev/null
+++ b/maven/projects/gluegen-rt-android/source-zip
@@ -0,0 +1 @@
+gluegen-java-src.zip
diff --git a/maven/projects/gluegen-rt-main/atomics b/maven/projects/gluegen-rt-main/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/gluegen-rt-main/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/gluegen-rt-main/dummy-jar b/maven/projects/gluegen-rt-main/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/gluegen-rt-main/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/gluegen-rt-main/natives b/maven/projects/gluegen-rt-main/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/gluegen-rt-main/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/gluegen-rt-main.pom.sh b/maven/projects/gluegen-rt-main/pom.sh
index fbd18fc..c163663 100755
--- a/maven/gluegen-rt-main.pom.sh
+++ b/maven/projects/gluegen-rt-main/pom.sh
@@ -1,14 +1,14 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 2 ]
then
- echo "usage: version" 1>&2
+ echo "usage: version projects+" 1>&2
exit 1
fi
VERSION="$1"
shift
-PLATFORMS=`cat make-platforms.txt | awk -F: '{print $1}'` || exit 1
+PLATFORMS="$@"
cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -60,7 +60,7 @@ cat <<EOF
EOF
-cat gluegen.pom.in || exit 1
+cat ../gluegen/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/gluegen-rt-main/source-zip b/maven/projects/gluegen-rt-main/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/gluegen-rt-main/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/gluegen-rt/atomics b/maven/projects/gluegen-rt/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/gluegen-rt/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/gluegen-rt/dummy-jar b/maven/projects/gluegen-rt/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/gluegen-rt/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/gluegen-rt/natives b/maven/projects/gluegen-rt/natives
new file mode 100644
index 0000000..660f1ae
--- /dev/null
+++ b/maven/projects/gluegen-rt/natives
@@ -0,0 +1 @@
+natives
diff --git a/maven/gluegen-rt.pom.sh b/maven/projects/gluegen-rt/pom.sh
index 9ff1443..66c65e7 100755
--- a/maven/gluegen-rt.pom.sh
+++ b/maven/projects/gluegen-rt/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat gluegen.pom.in || exit 1
+cat ../gluegen/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/gluegen-rt/source-zip b/maven/projects/gluegen-rt/source-zip
new file mode 100644
index 0000000..3847c62
--- /dev/null
+++ b/maven/projects/gluegen-rt/source-zip
@@ -0,0 +1 @@
+gluegen-java-src.zip
diff --git a/maven/projects/gluegen/atomics b/maven/projects/gluegen/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/gluegen/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/gluegen/dummy-jar b/maven/projects/gluegen/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/gluegen/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/gluegen/natives b/maven/projects/gluegen/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/gluegen/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/gluegen.pom.in b/maven/projects/gluegen/pom.in
index d592297..0dfa180 100644
--- a/maven/gluegen.pom.in
+++ b/maven/projects/gluegen/pom.in
@@ -1,4 +1,4 @@
- <!-- gluegen.pom.in -->
+ <!-- gluegen/pom.in -->
<scm>
<url>http://jogamp.org/git/?p=gluegen.git/</url>
diff --git a/maven/gluegen.pom.sh b/maven/projects/gluegen/pom.sh
index 5af0de9..f839723 100755
--- a/maven/gluegen.pom.sh
+++ b/maven/projects/gluegen/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat gluegen.pom.in || exit 1
+cat pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/gluegen/source-zip b/maven/projects/gluegen/source-zip
new file mode 100644
index 0000000..3847c62
--- /dev/null
+++ b/maven/projects/gluegen/source-zip
@@ -0,0 +1 @@
+gluegen-java-src.zip
diff --git a/maven/projects/joal-android/atomics b/maven/projects/joal-android/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/joal-android/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/joal-android/dummy-jar b/maven/projects/joal-android/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/joal-android/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/joal-android/natives b/maven/projects/joal-android/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/joal-android/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/joal-android.pom.sh b/maven/projects/joal-android/pom.sh
index cb5a1c2..a994f8c 100755
--- a/maven/joal-android.pom.sh
+++ b/maven/projects/joal-android/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat joal.pom.in || exit 1
+cat ../joal/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/joal-android/source-zip b/maven/projects/joal-android/source-zip
new file mode 100644
index 0000000..a468fe4
--- /dev/null
+++ b/maven/projects/joal-android/source-zip
@@ -0,0 +1 @@
+joal-java-src.zip
diff --git a/maven/projects/joal-main/atomics b/maven/projects/joal-main/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/joal-main/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/joal-main/dummy-jar b/maven/projects/joal-main/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/joal-main/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/joal-main/natives b/maven/projects/joal-main/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/joal-main/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/joal-main.pom.sh b/maven/projects/joal-main/pom.sh
index 5539a75..4a8dd94 100755
--- a/maven/joal-main.pom.sh
+++ b/maven/projects/joal-main/pom.sh
@@ -1,14 +1,15 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 2 ]
then
- echo "usage: version" 1>&2
+ echo "usage: version project+" 1>&2
exit 1
fi
VERSION="$1"
shift
-PLATFORMS=`cat make-platforms.txt | awk -F: '{print $1}'` || exit 1
+
+PLATFORMS="$@"
cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -60,7 +61,7 @@ cat <<EOF
EOF
-cat joal.pom.in || exit 1
+cat ../joal/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/joal-main/source-zip b/maven/projects/joal-main/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/joal-main/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/joal/atomics b/maven/projects/joal/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/joal/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/joal/dummy-jar b/maven/projects/joal/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/joal/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/joal/natives b/maven/projects/joal/natives
new file mode 100644
index 0000000..660f1ae
--- /dev/null
+++ b/maven/projects/joal/natives
@@ -0,0 +1 @@
+natives
diff --git a/maven/joal.pom.in b/maven/projects/joal/pom.in
index 898e402..740091c 100644
--- a/maven/joal.pom.in
+++ b/maven/projects/joal/pom.in
@@ -1,4 +1,4 @@
- <!-- joal.pom.in -->
+ <!-- joal/pom.in -->
<licenses>
<license>
diff --git a/maven/joal.pom.sh b/maven/projects/joal/pom.sh
index 313eb33..4a0cbac 100755
--- a/maven/joal.pom.sh
+++ b/maven/projects/joal/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat joal.pom.in || exit 1
+cat pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/joal/source-zip b/maven/projects/joal/source-zip
new file mode 100644
index 0000000..a468fe4
--- /dev/null
+++ b/maven/projects/joal/source-zip
@@ -0,0 +1 @@
+joal-java-src.zip
diff --git a/maven/projects/jocl-android/atomics b/maven/projects/jocl-android/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jocl-android/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jocl-android/dummy-jar b/maven/projects/jocl-android/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/jocl-android/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/jocl-android/natives b/maven/projects/jocl-android/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jocl-android/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jocl-android.pom.sh b/maven/projects/jocl-android/pom.sh
index e2c2c0f..4a0ac8c 100755
--- a/maven/jocl-android.pom.sh
+++ b/maven/projects/jocl-android/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jocl.pom.in || exit 1
+cat ../jocl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jocl-android/source-zip b/maven/projects/jocl-android/source-zip
new file mode 100644
index 0000000..e278b5a
--- /dev/null
+++ b/maven/projects/jocl-android/source-zip
@@ -0,0 +1 @@
+jocl-java-src.zip
diff --git a/maven/projects/jocl-main/atomics b/maven/projects/jocl-main/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jocl-main/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jocl-main/dummy-jar b/maven/projects/jocl-main/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/jocl-main/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/jocl-main/natives b/maven/projects/jocl-main/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jocl-main/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jocl-main.pom.sh b/maven/projects/jocl-main/pom.sh
index 323d285..1a86428 100755
--- a/maven/jocl-main.pom.sh
+++ b/maven/projects/jocl-main/pom.sh
@@ -1,14 +1,15 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 2 ]
then
- echo "usage: version" 1>&2
+ echo "usage: version projects+" 1>&2
exit 1
fi
VERSION="$1"
shift
-PLATFORMS=`cat make-platforms.txt | awk -F: '{print $1}'` || exit 1
+
+PLATFORMS=$@
cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -60,7 +61,7 @@ cat <<EOF
EOF
-cat jocl.pom.in || exit 1
+cat ../jocl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jocl-main/source-zip b/maven/projects/jocl-main/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/jocl-main/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/jocl/atomics b/maven/projects/jocl/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jocl/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jocl/dummy-jar b/maven/projects/jocl/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/jocl/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/jocl/natives b/maven/projects/jocl/natives
new file mode 100644
index 0000000..660f1ae
--- /dev/null
+++ b/maven/projects/jocl/natives
@@ -0,0 +1 @@
+natives
diff --git a/maven/jocl.pom.in b/maven/projects/jocl/pom.in
index f9e6a16..e7e7b56 100644
--- a/maven/jocl.pom.in
+++ b/maven/projects/jocl/pom.in
@@ -1,4 +1,4 @@
- <!-- jocl.pom.in -->
+ <!-- jocl/pom.in -->
<licenses>
<license>
diff --git a/maven/jocl.pom.sh b/maven/projects/jocl/pom.sh
index 4fc1756..32d0036 100755
--- a/maven/jocl.pom.sh
+++ b/maven/projects/jocl/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jocl.pom.in || exit 1
+cat pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jocl/source-zip b/maven/projects/jocl/source-zip
new file mode 100644
index 0000000..e278b5a
--- /dev/null
+++ b/maven/projects/jocl/source-zip
@@ -0,0 +1 @@
+jocl-java-src.zip
diff --git a/maven/projects/jogl-all-android/atomics b/maven/projects/jogl-all-android/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all-android/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all-android/dummy-jar b/maven/projects/jogl-all-android/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/jogl-all-android/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/jogl-all-android/natives b/maven/projects/jogl-all-android/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl-all-android/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jogl-all-android.pom.sh b/maven/projects/jogl-all-android/pom.sh
index 80b93a5..f80dc71 100755
--- a/maven/jogl-all-android.pom.sh
+++ b/maven/projects/jogl-all-android/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all-android/source-zip b/maven/projects/jogl-all-android/source-zip
new file mode 100644
index 0000000..ec55446
--- /dev/null
+++ b/maven/projects/jogl-all-android/source-zip
@@ -0,0 +1 @@
+jogl-java-src.zip
diff --git a/maven/projects/jogl-all-main/atomics b/maven/projects/jogl-all-main/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all-main/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all-main/dummy-jar b/maven/projects/jogl-all-main/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/jogl-all-main/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/jogl-all-main/natives b/maven/projects/jogl-all-main/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl-all-main/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jogl-all-main.pom.sh b/maven/projects/jogl-all-main/pom.sh
index 5a258c0..6f8959b 100755
--- a/maven/jogl-all-main.pom.sh
+++ b/maven/projects/jogl-all-main/pom.sh
@@ -1,14 +1,14 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 2 ]
then
- echo "usage: version" 1>&2
+ echo "usage: version platforms+" 1>&2
exit 1
fi
VERSION="$1"
shift
-PLATFORMS=`cat make-platforms.txt | awk -F: '{print $1}'` || exit 1
+PLATFORMS="$@"
cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -60,7 +60,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all-main/source-zip b/maven/projects/jogl-all-main/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/jogl-all-main/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/jogl-all-mobile-main/atomics b/maven/projects/jogl-all-mobile-main/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all-mobile-main/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all-mobile-main/dummy-jar b/maven/projects/jogl-all-mobile-main/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/jogl-all-mobile-main/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/jogl-all-mobile-main/natives b/maven/projects/jogl-all-mobile-main/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl-all-mobile-main/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jogl-all-mobile-main.pom.sh b/maven/projects/jogl-all-mobile-main/pom.sh
index 633e517..d1efc60 100755
--- a/maven/jogl-all-mobile-main.pom.sh
+++ b/maven/projects/jogl-all-mobile-main/pom.sh
@@ -1,14 +1,14 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 2 ]
then
- echo "usage: version" 1>&2
+ echo "usage: version platforms+" 1>&2
exit 1
fi
VERSION="$1"
shift
-PLATFORMS=`cat make-platforms.txt | awk -F: '{print $1}'` || exit 1
+PLATFORMS="$@"
cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -61,7 +61,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all-mobile-main/source-zip b/maven/projects/jogl-all-mobile-main/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/jogl-all-mobile-main/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/jogl-all-mobile/atomics b/maven/projects/jogl-all-mobile/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all-mobile/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all-mobile/dummy-jar b/maven/projects/jogl-all-mobile/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/jogl-all-mobile/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/jogl-all-mobile/natives b/maven/projects/jogl-all-mobile/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl-all-mobile/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jogl-all-mobile.pom.sh b/maven/projects/jogl-all-mobile/pom.sh
index 252728e..b6c0aed 100755
--- a/maven/jogl-all-mobile.pom.sh
+++ b/maven/projects/jogl-all-mobile/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all-mobile/source-zip b/maven/projects/jogl-all-mobile/source-zip
new file mode 100644
index 0000000..ec55446
--- /dev/null
+++ b/maven/projects/jogl-all-mobile/source-zip
@@ -0,0 +1 @@
+jogl-java-src.zip
diff --git a/maven/projects/jogl-all-noawt-main/atomics b/maven/projects/jogl-all-noawt-main/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all-noawt-main/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all-noawt-main/dummy-jar b/maven/projects/jogl-all-noawt-main/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/jogl-all-noawt-main/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/jogl-all-noawt-main/natives b/maven/projects/jogl-all-noawt-main/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl-all-noawt-main/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jogl-all-noawt-main.pom.sh b/maven/projects/jogl-all-noawt-main/pom.sh
index f812807..ae307ce 100755
--- a/maven/jogl-all-noawt-main.pom.sh
+++ b/maven/projects/jogl-all-noawt-main/pom.sh
@@ -1,15 +1,15 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 2 ]
then
- echo "usage: version" 1>&2
+ echo "usage: version platforms+" 1>&2
exit 1
fi
VERSION="$1"
shift
-PLATFORMS=`cat make-platforms.txt | awk -F: '{print $1}'` || exit 1
+PLATFORMS="$@"
cat <<EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -62,7 +62,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all-noawt-main/source-zip b/maven/projects/jogl-all-noawt-main/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/jogl-all-noawt-main/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/jogl-all-noawt/atomics b/maven/projects/jogl-all-noawt/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all-noawt/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all-noawt/dummy-jar b/maven/projects/jogl-all-noawt/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/jogl-all-noawt/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/jogl-all-noawt/natives b/maven/projects/jogl-all-noawt/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl-all-noawt/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/jogl-all-noawt.pom.sh b/maven/projects/jogl-all-noawt/pom.sh
index 8486688..3e583ff 100755
--- a/maven/jogl-all-noawt.pom.sh
+++ b/maven/projects/jogl-all-noawt/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all-noawt/source-zip b/maven/projects/jogl-all-noawt/source-zip
new file mode 100644
index 0000000..ec55446
--- /dev/null
+++ b/maven/projects/jogl-all-noawt/source-zip
@@ -0,0 +1 @@
+jogl-java-src.zip
diff --git a/maven/projects/jogl-all/atomics b/maven/projects/jogl-all/atomics
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/maven/projects/jogl-all/atomics
@@ -0,0 +1 @@
+
diff --git a/maven/projects/jogl-all/dummy-jar b/maven/projects/jogl-all/dummy-jar
new file mode 100644
index 0000000..3639190
--- /dev/null
+++ b/maven/projects/jogl-all/dummy-jar
@@ -0,0 +1 @@
+no-dummy-jar
diff --git a/maven/projects/jogl-all/natives b/maven/projects/jogl-all/natives
new file mode 100644
index 0000000..660f1ae
--- /dev/null
+++ b/maven/projects/jogl-all/natives
@@ -0,0 +1 @@
+natives
diff --git a/maven/jogl-all.pom.sh b/maven/projects/jogl-all/pom.sh
index db6f28b..3985f1b 100755
--- a/maven/jogl-all.pom.sh
+++ b/maven/projects/jogl-all/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat ../jogl/pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl-all/source-zip b/maven/projects/jogl-all/source-zip
new file mode 100644
index 0000000..ec55446
--- /dev/null
+++ b/maven/projects/jogl-all/source-zip
@@ -0,0 +1 @@
+jogl-java-src.zip
diff --git a/maven/projects/jogl/atomics b/maven/projects/jogl/atomics
new file mode 100644
index 0000000..820c78f
--- /dev/null
+++ b/maven/projects/jogl/atomics
@@ -0,0 +1 @@
+ awt core fonts-p0 gldesktop gldesktop-dbg glmobile glmobile-dbg glu glu-gldesktop omx os-android os-osx os-win os-x11 sdk swt util-awt util-fixedfuncemu util-gldesktop util-graph util
diff --git a/maven/projects/jogl/dummy-jar b/maven/projects/jogl/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/jogl/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/jogl/natives b/maven/projects/jogl/natives
new file mode 100644
index 0000000..ae3b2b0
--- /dev/null
+++ b/maven/projects/jogl/natives
@@ -0,0 +1 @@
+no-natives
diff --git a/maven/newt.pom.in b/maven/projects/jogl/pom.in
index fb230c9..8753ab3 100644
--- a/maven/newt.pom.in
+++ b/maven/projects/jogl/pom.in
@@ -1,4 +1,4 @@
- <!-- newt.pom.in -->
+ <!-- jogl/pom.in -->
<licenses>
<license>
diff --git a/maven/jogl.pom.sh b/maven/projects/jogl/pom.sh
index 29a09d4..f1ac98a 100755
--- a/maven/jogl.pom.sh
+++ b/maven/projects/jogl/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat jogl.pom.in || exit 1
+cat pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/jogl/source-zip b/maven/projects/jogl/source-zip
new file mode 100644
index 0000000..ec55446
--- /dev/null
+++ b/maven/projects/jogl/source-zip
@@ -0,0 +1 @@
+jogl-java-src.zip
diff --git a/maven/projects/nativewindow/atomics b/maven/projects/nativewindow/atomics
new file mode 100644
index 0000000..d02423b
--- /dev/null
+++ b/maven/projects/nativewindow/atomics
@@ -0,0 +1 @@
+ awt core os-osx os-win os-x11
diff --git a/maven/projects/nativewindow/dummy-jar b/maven/projects/nativewindow/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/nativewindow/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/nativewindow/natives b/maven/projects/nativewindow/natives
new file mode 100644
index 0000000..0d307de
--- /dev/null
+++ b/maven/projects/nativewindow/natives
@@ -0,0 +1 @@
+atomic-natives
diff --git a/maven/nativewindow.pom.in b/maven/projects/nativewindow/pom.in
index d9d6639..4a4f31f 100644
--- a/maven/nativewindow.pom.in
+++ b/maven/projects/nativewindow/pom.in
@@ -1,4 +1,4 @@
- <!-- nativewindow.pom.in -->
+ <!-- nativewindow/pom.in -->
<licenses>
<license>
diff --git a/maven/nativewindow.pom.sh b/maven/projects/nativewindow/pom.sh
index d595a85..e4ceda0 100755
--- a/maven/nativewindow.pom.sh
+++ b/maven/projects/nativewindow/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat nativewindow.pom.in || exit 1
+cat pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/nativewindow/source-zip b/maven/projects/nativewindow/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/nativewindow/source-zip
@@ -0,0 +1 @@
+dummy-src
diff --git a/maven/projects/newt/atomics b/maven/projects/newt/atomics
new file mode 100644
index 0000000..939c443
--- /dev/null
+++ b/maven/projects/newt/atomics
@@ -0,0 +1 @@
+ awt core driver-android driver-bcm-old driver-bcm-vc driver-intelgdl driver-kd driver-linux driver-osx driver-win driver-x11 event ogl swt
diff --git a/maven/projects/newt/dummy-jar b/maven/projects/newt/dummy-jar
new file mode 100644
index 0000000..94e337a
--- /dev/null
+++ b/maven/projects/newt/dummy-jar
@@ -0,0 +1 @@
+dummy-jar
diff --git a/maven/projects/newt/natives b/maven/projects/newt/natives
new file mode 100644
index 0000000..0d307de
--- /dev/null
+++ b/maven/projects/newt/natives
@@ -0,0 +1 @@
+atomic-natives
diff --git a/maven/jogl.pom.in b/maven/projects/newt/pom.in
index 3d46549..500b264 100644
--- a/maven/jogl.pom.in
+++ b/maven/projects/newt/pom.in
@@ -1,4 +1,4 @@
- <!-- jogl.pom.in -->
+ <!-- newt/pom.in -->
<licenses>
<license>
diff --git a/maven/newt.pom.sh b/maven/projects/newt/pom.sh
index 8b38763..da45efc 100755
--- a/maven/newt.pom.sh
+++ b/maven/projects/newt/pom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ $# -ne 1 ]
+if [ $# -lt 1 ]
then
echo "usage: version" 1>&2
exit 1
@@ -31,7 +31,7 @@ cat <<EOF
EOF
-cat newt.pom.in || exit 1
+cat pom.in || exit 1
cat <<EOF
</project>
EOF
diff --git a/maven/projects/newt/source-zip b/maven/projects/newt/source-zip
new file mode 100644
index 0000000..d405da9
--- /dev/null
+++ b/maven/projects/newt/source-zip
@@ -0,0 +1 @@
+dummy-src