steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This reverts commit 599c2cdba2.

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)
db4
Doug Coleman 2014-11-11 00:16:00 -08:00
parent 599c2cdba2
commit a6dd9a025c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Factor.app/Contents/Info.plist
View File

@ -32,7 +32,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.98-git</string> <string>0.98</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2003-2014 Factor developers</string> <string>Copyright © 2003-2014 Factor developers</string>
<key>NSServices</key> <key>NSServices</key>

2
GNUmakefile
View File

@ -1,5 +1,5 @@
ifdef CONFIG ifdef CONFIG
VERSION = 0.98-git VERSION = 0.98
GIT_LABEL = $(shell git describe --all --long) GIT_LABEL = $(shell git describe --all --long)
BUNDLE = Factor.app BUNDLE = Factor.app

2
build-support/factor.cmd
View File

@ -30,7 +30,7 @@ if not errorlevel 1 (
git describe --all --long > git_label.tmp git describe --all --long > git_label.tmp
set /p git_label= < git_label.tmp set /p git_label= < git_label.tmp
set version=0.98-git set version=0.98
if %_bootimage_version%==clean ( if %_bootimage_version%==clean (
set _git_branch=clean-windows-%_target% set _git_branch=clean-windows-%_target%