From: Doug Coleman Date: Tue, 11 Nov 2014 08:16:00 +0000 (-0800) Subject: Revert "version number: 0.98 -> 0.98-git. @bjourne suggested, some python projects... X-Git-Tag: unmaintained~3375 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=a6dd9a025c7b735d30cd0dbda19b0b80866876ce Revert "version number: 0.98 -> 0.98-git. @bjourne suggested, some python projects do this too." 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 ad20fc25bf..7040625810 100644 --- a/Factor.app/Contents/Info.plist +++ b/Factor.app/Contents/Info.plist @@ -32,7 +32,7 @@ CFBundlePackageType APPL CFBundleVersion - 0.98-git + 0.98 NSHumanReadableCopyright Copyright © 2003-2014 Factor developers NSServices diff --git a/GNUmakefile b/GNUmakefile index 1047caf0e0..b94c833e84 100644 --- 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 178fa818e6..34787502b9 100644 --- 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 set /p git_label= < git_label.tmp -set version=0.98-git +set version=0.98 if %_bootimage_version%==clean ( set _git_branch=clean-windows-%_target%