s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SVN revision & add OS name for builds

Browse Source
This commit is contained in:
Tom Morris 2013-07-29 17:59:00 -04:00
parent 9450d483ce
commit fc6d1821ea
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.xml
View File

@ -14,7 +14,6 @@
<property environment="env"/> <property environment="env"/>
<property name="version" value="trunk"/> <property name="version" value="trunk"/>
<property name="revision" value="rXXXX"/>
<property name="full_version" value="0.0.0.0"/> <property name="full_version" value="0.0.0.0"/>
<property name="build.dir" value="build"/> <property name="build.dir" value="build"/>
<property name="dist.dir" value="dist"/> <property name="dist.dir" value="dist"/>
@ -25,7 +24,7 @@
<property name="appengine.version" value="1"/> <property name="appengine.version" value="1"/>
<property name="appengine.sdk.dir" value="/opt/appengine"/> <property name="appengine.sdk.dir" value="/opt/appengine"/>
<property name="fullname" value="openrefine-${version}-${revision}" /> <property name="fullname" value="openrefine-${version}" />
<property name="main.dir" value="${basedir}/main" /> <property name="main.dir" value="${basedir}/main" />
@ -222,7 +221,6 @@
<replace file="${built.webapp.dir}/WEB-INF/web.xml"> <replace file="${built.webapp.dir}/WEB-INF/web.xml">
<replacefilter token="$VERSION" value="${version}"/> <replacefilter token="$VERSION" value="${version}"/>
<replacefilter token="$REVISION" value="${revision}"/>
</replace> </replace>
<replace file="${built.webapp.dir}/WEB-INF/butterfly.properties"> <replace file="${built.webapp.dir}/WEB-INF/butterfly.properties">
@ -254,7 +252,7 @@
</classpath> </classpath>
<option value="-Xms256M"/> <option value="-Xms256M"/>
<option value="-Xmx1024M"/> <option value="-Xmx1024M"/>
<option value="-Drefine.version=${revision}"/> <option value="-Drefine.version=${version}"/>
<option value="-Drefine.webapp=$APP_ROOT/Contents/Resource/${built.webapp.name}"/> <option value="-Drefine.webapp=$APP_ROOT/Contents/Resource/${built.webapp.name}"/>
</bundleapp> </bundleapp>
@ -294,7 +292,7 @@
<cp>server/lib/*.jar</cp> <cp>server/lib/*.jar</cp>
</classPath> </classPath>
<jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024"> <jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024">
<opt>-Djava.library.path=server/lib/native/windows -Drefine.version=${revision}</opt> <opt>-Djava.library.path=server/lib/native/windows </opt>
</jre> </jre>
<versionInfo <versionInfo
fileVersion="${full_version}" fileVersion="${full_version}"
@ -341,7 +339,7 @@
<copy file="${basedir}/LICENSE.txt" tofile="${windows.dir}/LICENSE.txt"/> <copy file="${basedir}/LICENSE.txt" tofile="${windows.dir}/LICENSE.txt"/>
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<zip destfile="${dist.dir}/openrefine-${version}-${revision}.zip" basedir="${windows.dir}/.." includes="${release.name}/**"/> <zip destfile="${dist.dir}/openrefine-win-${version}.zip" basedir="${windows.dir}/.." includes="${release.name}/**"/>
</target> </target>
<target name="linux" depends="jar, prepare_webapp"> <target name="linux" depends="jar, prepare_webapp">
@ -372,7 +370,7 @@
<copy file="${basedir}/refine" tofile="${linux.dir}/refine"/> <copy file="${basedir}/refine" tofile="${linux.dir}/refine"/>
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<tar longfile="gnu" compression="gzip" destfile="${dist.dir}/openrefine-${version}-${revision}.tar.gz"> <tar longfile="gnu" compression="gzip" destfile="${dist.dir}/openrefine-linux-${version}.tar.gz">
<tarfileset dir="${linux.dir}/.." filemode="755"> <tarfileset dir="${linux.dir}/.." filemode="755">
<include name="${release.name}/refine"/> <include name="${release.name}/refine"/>
</tarfileset> </tarfileset>

22
refine
View File

@ -470,7 +470,7 @@ ant() {
#export ANT_OPTS="-Xmx1024M" #export ANT_OPTS="-Xmx1024M"
"$ANT" -f build.xml $ANT_PARAMS -Dversion="$VERSION" -Dfull_version="$FULL_VERSION" -Drevision="$REVISION" $1 || error "Error while running ant task '$1'" "$ANT" -f build.xml $ANT_PARAMS -Dversion="$VERSION" -Dfull_version="$FULL_VERSION" $1 || error "Error while running ant task '$1'"
} }
# ---------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------
@ -482,9 +482,9 @@ dist() {
echo "All distributions were built and are located at $REFINE_DIST_DIR" echo "All distributions were built and are located at $REFINE_DIST_DIR"
echo echo
echo "Upload them to the distibution site, then prepend the GoogleRefineReleases array at" echo "Upload them to the distibution site, then prepend the releases array at"
echo echo
echo " http://code.google.com/p/google-refine/source/browse/support/releases2.js" echo " https://github.com/OpenRefine/OpenRefine/tree/gh-pages/javascript/releases.js"
echo echo
echo "with" echo "with"
echo echo
@ -534,6 +534,12 @@ mac_dist() {
if [ -f "$REFINE_BUILD_DIR/temp_refine.dmg" ] ; then if [ -f "$REFINE_BUILD_DIR/temp_refine.dmg" ] ; then
rm "$REFINE_BUILD_DIR/temp_refine.dmg" rm "$REFINE_BUILD_DIR/temp_refine.dmg"
fi fi
# Experimental code signing stuff
# codesign -s "OpenRefine Code Signing" "$REFINE_BUILD_DIR/mac/OpenRefine.app"
# spctl --assess --type execute "$REFINE_BUILD_DIR/mac/OpenRefine.app"
# TODO add unsign code here
TITLE="OpenRefine $VERSION" TITLE="OpenRefine $VERSION"
echo "Building MacOSX DMG for $TITLE" echo "Building MacOSX DMG for $TITLE"
@ -569,14 +575,14 @@ mac_dist() {
sync sync
hdiutil detach $DEVICE hdiutil detach $DEVICE
if [ -f "$REFINE_DIST_DIR/openrefine-$VERSION-$REVISION.dmg" ] ; then if [ -f "$REFINE_DIST_DIR/openrefine-mac-$VERSION.dmg" ] ; then
rm "$REFINE_DIST_DIR/openrefine-$VERSION-$REVISION.dmg" rm "$REFINE_DIST_DIR/openrefine-mac-$VERSION.dmg"
fi fi
hdiutil convert "$REFINE_BUILD_DIR/temp_refine.dmg" -format UDZO -imagekey zlib-level=9 -o "$REFINE_DIST_DIR/openrefine-$VERSION-$REVISION.dmg" || error "Error compressing DMG" hdiutil convert "$REFINE_BUILD_DIR/temp_refine.dmg" -format UDZO -imagekey zlib-level=9 -o "$REFINE_DIST_DIR/openrefine-mac-$VERSION.dmg" || error "Error compressing DMG"
hdiutil internet-enable -yes "$REFINE_DIST_DIR/openrefine-$VERSION-$REVISION.dmg" || error "Error internet-enabling DMG" hdiutil internet-enable -yes "$REFINE_DIST_DIR/openrefine-mac-$VERSION.dmg" || error "Error internet-enabling DMG"
#rm -f "$REFINE_BUILD_DIR/temp_refine.dmg" rm -f "$REFINE_BUILD_DIR/temp_refine.dmg"
} }
test() { test() {