jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r777992 - in /incubator/jspwiki/scripts: .project build_jspwiki_distro.sh make_jspwiki_nightly.sh
Date Sat, 23 May 2009 19:15:41 GMT
Author: jalkanen
Date: Sat May 23 19:15:40 2009
New Revision: 777992

URL: http://svn.apache.org/viewvc?rev=777992&view=rev
Log:
Fixed license notices.
Build script now builds SHA and MD5 hashes
preset env variables are now heeded in some cases.

Added:
    incubator/jspwiki/scripts/.project
Modified:
    incubator/jspwiki/scripts/build_jspwiki_distro.sh
    incubator/jspwiki/scripts/make_jspwiki_nightly.sh

Added: incubator/jspwiki/scripts/.project
URL: http://svn.apache.org/viewvc/incubator/jspwiki/scripts/.project?rev=777992&view=auto
==============================================================================
--- incubator/jspwiki/scripts/.project (added)
+++ incubator/jspwiki/scripts/.project Sat May 23 19:15:40 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jspwiki-scripts</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Modified: incubator/jspwiki/scripts/build_jspwiki_distro.sh
URL: http://svn.apache.org/viewvc/incubator/jspwiki/scripts/build_jspwiki_distro.sh?rev=777992&r1=777991&r2=777992&view=diff
==============================================================================
--- incubator/jspwiki/scripts/build_jspwiki_distro.sh (original)
+++ incubator/jspwiki/scripts/build_jspwiki_distro.sh Sat May 23 19:15:40 2009
@@ -1,5 +1,23 @@
 #!/bin/sh
-
+#
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements.  See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership.  The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied.  See the License for the
+#    specific language governing permissions and limitations
+#    under the License.    
+#
+#########################################################################################
 #
 #  This script compiles a JSPWiki release.  ATM it's pretty much hardcoded to certain basic
 #  assumptions (OSX, Europe, distributions go to ecyrd.com). We can fix these later.
@@ -8,9 +26,20 @@
 #
 #  E.g. branchname can be "tags/jspwiki_3_0_0" or "branches/JSPWIKI_2_8_BRANCH" or "trunk".
Default is "trunk".
 #
+#  You may set the following environmental variables before you invoke this script
+#
+#  DESTDIR : where the final deliverables are built
+#  JAVA_HOME : where the java home is.
+# 
+if [ "${DESTDIR}" = "" ]
+then
+	DESTDIR=${HOME}/Documents/public_html
+fi
 
-DESTDIR=${HOME}/Documents/public_html
-JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
+if [ "${JAVA_HOME}" = "" ]
+then
+	JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
+fi
 
 BUILDDIR=/tmp/${USER}/JSPWiki-build/
 BUILDPROPERTIES=${HOME}/Projects/jspwiki_release_build.properties
@@ -23,6 +52,16 @@
 BRANCH="trunk"
 
 #
+#  Creates the checksums and GPG signature of a release artifact
+#
+function checknsign {
+	gpg --print-md MD5 $1 > $1.md5
+	gpg --print-md SHA1 $1 > $1.sha
+
+	gpg -sba $1
+}
+
+#
 #  Start
 #
 
@@ -37,6 +76,8 @@
     exit 1
 fi
 
+echo "DESTDIR=${DESTDIR}"
+echo "JAVA_HOME=${JAVA_HOME}"
 echo "Using branch '${BRANCH}' from ${SVNHOME}/${SVNPROJECT}"
 
 #
@@ -51,7 +92,7 @@
 cd ${BUILDDIR} || ( echo "Failed CD" && exit 5 )
 
 echo "Checking out project from SVN..."
-svn co ${SVNHOME}/${SVNPROJECT}/${BRANCH} ${SVNPROJECT}
+svn co ${SVNHOME}/${SVNPROJECT}/${BRANCH} ${SVNPROJECT} >> ${LOGFILE}
 
 echo "Compiling..."
 cd ${SVNPROJECT}
@@ -61,9 +102,9 @@
 #  Compilation done, now prepare the proper place for the distribution
 #
 
-VERSION=`java -cp build/JSPWiki.jar com.ecyrd.jspwiki.Release`
+VERSION=`java -cp build/JSPWiki.jar org.apache.wiki.Release`
 
-echo "${CVSPROJECT} version ${VERSION}: preparing distro..."
+echo "${SVNPROJECT} version ${VERSION}: preparing distro..."
 
 DIST=${BUILDDIR}/${SVNPROJECT}/releases
 DISTBIN=${DIST}/JSPWiki-bin.zip
@@ -82,7 +123,7 @@
 #
 
 DEST=${DESTDIR}/JSPWiki/${VERSION}
-echo "Installing to ${DEST}..."
+echo "Deliverables go to ${DEST}..."
 mkdir -p ${DEST}
 cd ${DEST} || ( echo "Could not find directory" && exit 5 )
 
@@ -92,10 +133,10 @@
 cp ${BUILDDIR}/JSPWiki/ChangeLog ${DEST}
 cp ${BUILDDIR}/JSPWiki/ReleaseNotes ${DEST}
 
-#gsha1sum -b > ${DEST}/${CVSPROJECT}-${VERSION}-bin.sha1 ${DEST}/${DESTBIN}
+# Generate checksums and signatures.
 
-gpg -sba ${DEST}/${DESTBIN}
-gpg -sba ${DEST}/${DESTSRC}
+checknsign ${DEST}/${DESTBIN}
+checknsign ${DEST}/${DESTSRC}
 
 #
 #  Finished.

Modified: incubator/jspwiki/scripts/make_jspwiki_nightly.sh
URL: http://svn.apache.org/viewvc/incubator/jspwiki/scripts/make_jspwiki_nightly.sh?rev=777992&r1=777991&r2=777992&view=diff
==============================================================================
--- incubator/jspwiki/scripts/make_jspwiki_nightly.sh (original)
+++ incubator/jspwiki/scripts/make_jspwiki_nightly.sh Sat May 23 19:15:40 2009
@@ -1,5 +1,24 @@
 #!/bin/sh
 #
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements.  See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership.  The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied.  See the License for the
+#    specific language governing permissions and limitations
+#    under the License.    
+#
+######################################################################
+#
 #  This script is used to build the JSPWiki nightly builds.
 #  Assumptions: java and ant are available in the classpath. Also sha1 program is required.
 #



Mime
View raw message