Revert "version number: 0.98 -> 0.98-git. @bjourne suggested, some python projects...

This reverts commit 599c2cdba265004cad444e1f4e6651e19b143661.

XXX: Mac fails with this error:

c++ -Wall -DFACTOR_VERSION="0.98-git" -DFACTOR_GIT_LABEL="heads/master-0-g599c2cd" -fomit-frame-pointer -mmacosx-version-min=10.5 -m64 -O3 -g -dynamiclib -single_module -current_version 0.98-git -compatibility_version 0.98-git -fvisibility=hidden -lm -framework Cocoa -framework AppKit -o libfactor.dylib vm/os-unix.o vm/os-macosx.o vm/mach_signal.o vm/mvm-unix.o vm/cpu-x86.o vm/aging_collector.o vm/alien.o vm/arrays.o vm/bignum.o vm/byte_arrays.o vm/callbacks.o vm/callstack.o vm/code_blocks.o vm/code_heap.o vm/compaction.o vm/contexts.o vm/data_heap.o vm/data_heap_checker.o vm/debug.o vm/dispatch.o vm/entry_points.o vm/errors.o vm/factor.o vm/free_list.o vm/full_collector.o vm/gc.o vm/gc_info.o vm/image.o vm/inline_cache.o vm/instruction_operands.o vm/io.o vm/jit.o vm/math.o vm/mvm.o vm/nursery_collector.o vm/object_start_map.o vm/objects.o vm/primitives.o vm/quotations.o vm/run.o vm/safepoints.o vm/sampling_profiler.o vm/strings.o vm/to_tenured_collector.o vm/tuples.o vm/utilities.o vm/vm.o vm/words.o
ld: malformed 32-bit x.y.z version number: 0.98-git
clang: error: linker command failed with exit code 1 (use -v to see invocation)

diff --git a/Factor.app/Contents/Info.plist b/Factor.app/Contents/Info.plist
index ad20fc25bf2d590fdab1f6793713e1610b1c036f..704062581004651c9efc904b1bf9642902885831 100644 (file)
--- a/Factor.app/Contents/Info.plist
+++ b/Factor.app/Contents/Info.plist
@@ -32,7 +32,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleVersion</key>
-       <string>0.98-git</string>
+       <string>0.98</string>
        <key>NSHumanReadableCopyright</key>
        <string>Copyright © 2003-2014 Factor developers</string>
        <key>NSServices</key>

diff --git a/GNUmakefile b/GNUmakefile
index 1047caf0e0139ba6cb81dce08e78f9d75cf8bf13..b94c833e84d293f3dbdb028a76f9fcff1a627bd2 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
 ifdef CONFIG
-       VERSION = 0.98-git
+       VERSION = 0.98
        GIT_LABEL = $(shell git describe --all --long)
 
        BUNDLE = Factor.app

diff --git a/build-support/factor.cmd b/build-support/factor.cmd
index 178fa818e61755cb47eb1d0ec3178e1d130e41d7..34787502b96d9339d178eede18d6bc2d58b43905 100644 (file)
--- a/build-support/factor.cmd
+++ b/build-support/factor.cmd
@@ -30,7 +30,7 @@ if not errorlevel 1 (
 git describe --all --long > git_label.tmp\r
 set /p git_label= < git_label.tmp\r
 \r
-set version=0.98-git\r
+set version=0.98\r
 \r
 if %_bootimage_version%==clean (\r
     set _git_branch=clean-windows-%_target%\r