Permalink
Browse files

add VERSION and COMMIT to install (to remove git error in sys.ji), ad…

…d .exe to julia targets for windows
  • Loading branch information...
vtjnash committed Jan 9, 2013
1 parent a54138d commit da64e448192f4f4bbd9d82dfc4bfdba746a83524
Showing with 29 additions and 17 deletions.
  1. +4 −2 Make.inc
  2. +3 −2 Makefile
  3. +11 −2 base/version.jl
  4. +8 −8 ui/Makefile
  5. +3 −3 ui/webserver/Makefile
View
@@ -67,8 +67,10 @@ endif
ifeq ($(OS), WINNT)
fPIC =
PATH := ${PATH}:${BUILD}/lib:${BUILD}/lib/julia
+EXE = .exe
else
fPIC = -fPIC
+EXE =
endif
DEFAULT_REPL = readline
@@ -362,8 +364,8 @@ $$(abspath $(2)/$(1)): | $$(abspath $(2))
endef
endif
-JULIA_EXECUTABLE_debug = $(BUILD)/bin/julia-debug-$(DEFAULT_REPL)
-JULIA_EXECUTABLE_release = $(BUILD)/bin/julia-release-$(DEFAULT_REPL)
+JULIA_EXECUTABLE_debug = $(BUILD)/bin/julia-debug-$(DEFAULT_REPL)$(EXE)
+JULIA_EXECUTABLE_release = $(BUILD)/bin/julia-release-$(DEFAULT_REPL)$(EXE)
ifeq ($(OS), WINNT)
JULIA_EXECUTABLE = $(JULIA_EXECUTABLE_release)
View
@@ -40,7 +40,7 @@ $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji: VERSION base/*.jl $(BUILD)/share/julia/hel
run-julia-debug run-julia-release: run-julia-%:
$(MAKE) $(QUIET_MAKE) run-julia JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$*)"
run-julia:
- winedbg --gdb $(JULIA_EXECUTABLE)
+ $(JULIA_EXECUTABLE)
# public libraries, that are installed in $(PREFIX)/lib
JL_LIBS = julia-release julia-debug
@@ -85,7 +85,8 @@ else
done
endif
endif
- echo `cat VERSION` +`git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/VERSION
+ cp $(JULIAHOME)/VERSION $(PREFIX)/share/julia/VERSION
+ echo `git rev-parse --short HEAD`-$(OS)-$(ARCH) \(`date +"%Y-%m-%d %H:%M:%S"`\) > $(PREFIX)/share/julia/COMMIT
dist:
rm -fr julia-*.tar.gz julia-$(JULIA_COMMIT)
View
@@ -137,11 +137,19 @@ end
if(isfile("$JULIA_HOME/../../VERSION"))
const VERSION = convert(VersionNumber,readchomp("$JULIA_HOME/../../VERSION"))
-elseif(isfile("$JULIA_HOME/../VERSION"))
- const VERSION = convert(VersionNumber,readchomp("$JULIA_HOME/../VERSION"))
+elseif(isfile("$JULIA_HOME/../share/julia/VERSION"))
+ const VERSION = convert(VersionNumber,readchomp("$JULIA_HOME/../share/julia/VERSION"))
else
const VERSION = convert(VersionNumber,"0.0.0")
end
+if(isfile("$JULIA_HOME/../../COMMIT"))
+ const VERSION_COMMIT = ""
+ const commit_string = readchomp("$JULIA_HOME/../../COMMIT")
+elseif(isfile("JULIA_HOME/../share/julia/COMMIT"))
+ const VERSION_COMMIT = ""
+ const commit_string = readchomp("$JULIA_HOME/../share/julia/COMMIT")
+else
+
let
expected = ErrorException("error: don't copy this code, for breaking out of uv_run during boot-strapping only")
acceptable = ErrorException(expected.msg) # we would like to update the error msg for this later, but at
@@ -214,6 +222,7 @@ let
end
end
end
+end
begin
const version_string = "Version $VERSION"
const banner_plain =
View
@@ -27,19 +27,19 @@ $(BUILD)/bin/julia.bat: ${JULIAHOME}/contrib/windows/*.bat
julia-release julia-debug: $(BUILD)/bin/julia.bat
endif
-julia-release-basic: $(BUILD)/bin/julia-release-basic
-julia-debug-basic: $(BUILD)/bin/julia-debug-basic
-julia-release-readline: $(BUILD)/bin/julia-release-readline
-julia-debug-readline: $(BUILD)/bin/julia-debug-readline
+julia-release-basic: $(BUILD)/bin/julia-release-basic$(EXE)
+julia-debug-basic: $(BUILD)/bin/julia-debug-basic$(EXE)
+julia-release-readline: $(BUILD)/bin/julia-release-readline$(EXE)
+julia-debug-readline: $(BUILD)/bin/julia-debug-readline$(EXE)
-$(BUILD)/bin/julia-release-basic: repl.o repl-basic.o
+$(BUILD)/bin/julia-release-basic$(EXE): repl.o repl-basic.o
$(QUIET_LINK) $(CXX) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-release
-$(BUILD)/bin/julia-debug-basic: repl.do repl-basic.do
+$(BUILD)/bin/julia-debug-basic$(EXE): repl.do repl-basic.do
$(QUIET_LINK) $(CXX) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-debug
-$(BUILD)/bin/julia-release-readline: repl.o repl-readline.o
+$(BUILD)/bin/julia-release-readline$(EXE): repl.o repl-readline.o
$(QUIET_LINK) $(CXX) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ $(READLINE) -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-release
-$(BUILD)/bin/julia-debug-readline: repl.do repl-readline.do
+$(BUILD)/bin/julia-debug-readline$(EXE): repl.do repl-readline.do
$(QUIET_LINK) $(CXX) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ $(READLINE) -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-debug
clean: | $(CLEAN_TARGETS)
View
@@ -24,15 +24,15 @@ WEBSERVER_SRCS = webserver.o server.o jsoncpp.o
%.do: %.cpp *.h
$(QUIET_CC)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEBUGFLAGS) -c $< -o $@
-julia-release julia-debug: %: $(BUILD)/bin/%-webserver $(BUILD)/bin/$(LAUNCH_SCRIPT) $(BUILD)/etc/nginx.conf
+julia-release julia-debug: %: $(BUILD)/bin/%-webserver$(EXE) $(BUILD)/bin/$(LAUNCH_SCRIPT) $(BUILD)/etc/nginx.conf
release debug:
$(MAKE) julia-$@
-$(BUILD)/bin/julia-release-webserver: $(WEBSERVER_SRCS)
+$(BUILD)/bin/julia-release-webserver$(EXE): $(WEBSERVER_SRCS)
$(QUIET_LINK) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(SHIPFLAGS) $(LDFLAGS) $(WEBSERVER_SRCS) $(LIBS)
-$(BUILD)/bin/julia-debug-webserver: $(WEBSERVER_SRCS)
+$(BUILD)/bin/julia-debug-webserver$(EXE): $(WEBSERVER_SRCS)
$(QUIET_LINK) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(DEBUGFLAGS) $(LDFLAGS) $(WEBSERVER_SRCS) $(LIBS)
ifeq ($(OS),WINNT)

0 comments on commit da64e44

Please sign in to comment.