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

Clean up version handling

Browse Source
This commit is contained in:
Tom Morris 2013-07-29 18:30:23 -04:00
parent fc6d1821ea
commit 840c8979cf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -275,6 +275,7 @@
</target> </target>
<target name="windows" depends="jar, prepare_webapp"> <target name="windows" depends="jar, prepare_webapp">
<echo message="Full version ${full_version} and version ${version}"/>
<mkdir dir="${windows.dir}"/> <mkdir dir="${windows.dir}"/>
<taskdef <taskdef
name="launch4j" name="launch4j"
@ -300,7 +301,7 @@
fileDescription="openrefine" fileDescription="openrefine"
copyright="Copyright (c) 2013 OpenRefine contributors, 2010, Google, Inc." copyright="Copyright (c) 2013 OpenRefine contributors, 2010, Google, Inc."
productVersion="${full_version}" productVersion="${full_version}"
txtProductVersion="${full_version}" txtProductVersion="${version}"
productName="OpenRefine" productName="OpenRefine"
companyName="OpenRefine team" companyName="OpenRefine team"
internalName="openrefine" internalName="openrefine"

2
refine
View File

@ -186,7 +186,7 @@ get_version() {
fail "Must specify a version number" fail "Must specify a version number"
fi fi
NUM_VERSION=`echo $VERSION | sed -E 's/[a-zA-Z]+/./g'` NUM_VERSION=`echo $VERSION | sed -E 's/-.*//g'`
if [ "${NUM_VERSION}" = "" ] ; then if [ "${NUM_VERSION}" = "" ] ; then
fail "${VERSION} is not a valid version number" fail "${VERSION} is not a valid version number"