Merge pull request #4177 from JuliaLang/sf/canwereleasealready

Rename julia-release-* -> julia-*, libjulia-release -> libjulia

Make.inc

@@ -476,7 +476,7 @@ wine_pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(shell printf %s\n '
 pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(2)))))
 
 JULIA_EXECUTABLE_debug = $(BUILD)/bin/julia-debug-$(DEFAULT_REPL)$(EXE)
-JULIA_EXECUTABLE_release = $(BUILD)/bin/julia-release-$(DEFAULT_REPL)$(EXE)
+JULIA_EXECUTABLE_release = $(BUILD)/bin/julia-$(DEFAULT_REPL)$(EXE)
 
 ifeq ($(OS), WINNT)
 JULIA_EXECUTABLE = $(JULIA_EXECUTABLE_release)

Makefile

@@ -32,7 +32,11 @@ julia-debug julia-release:
 	@$(MAKE) $(QUIET_MAKE) -C ui $@
 ifneq ($(OS),WINNT)
 ifndef JULIA_VAGRANT_BUILD
+ifeq ($@,debug)
 	@ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia
+else
+	@ln -sf $(BUILD)/bin/julia-$(DEFAULT_REPL) julia
+endif
 endif
 endif
 
@@ -63,7 +67,7 @@ run:
 	@$(call spawn,$(cmd))
 
 # public libraries, that are installed in $(PREFIX)/lib
-JL_LIBS = julia-release julia-debug
+JL_LIBS = julia julia-debug
 
 # private libraries, that are installed in $(PREFIX)/lib/julia
 JL_PRIVATE_LIBS = amd arpack camd ccolamd cholmod colamd \
@@ -81,7 +85,7 @@ install:
 	done
 	cp -a $(BUILD)/bin $(PREFIX)
 ifneq ($(OS),WINNT)
-	cd $(PREFIX)/bin && ln -sf julia-release-$(DEFAULT_REPL) julia
+	cd $(PREFIX)/bin && ln -sf julia-$(DEFAULT_REPL) julia
 endif
 	-for suffix in $(JL_LIBS) ; do \
 		cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
@@ -158,10 +162,9 @@ clean: | $(CLEAN_TARGETS)
 	@$(MAKE) -C base clean
 	@$(MAKE) -C src clean
 	@$(MAKE) -C ui clean
-	@for buildtype in "release" "debug" ; do \
-		for repltype in "basic" "readline"; do \
-			rm -f julia-$${buildtype}-$${repltype}; \
-		done \
+	for repltype in "basic" "readline"; do \
+		rm -f julia-debug-$${repltype}; \
+		rm -f julia-$${repltype}; \
 	done
 	@rm -f julia
 	@rm -f *~ *# *.tar.gz

base/multi.jl

@@ -1155,7 +1155,7 @@ end
 # to be mutually reachable without a tunnel, as is often the case in a cluster.
 function addprocs_internal(np::Integer;
                   tunnel=false, dir=JULIA_HOME,
-                  exename=(ccall(:jl_is_debugbuild,Cint,())==0?"./julia-release-basic":"./julia-debug-basic"),
+                  exename=(ccall(:jl_is_debugbuild,Cint,())==0?"./julia-basic":"./julia-debug-basic"),
                   sshflags::Cmd=``, cman=LocalManager(), exeflags=``)
 
     config={:dir=>dir, :exename=>exename, :exeflags=>`$exeflags --worker`, :tunnel=>tunnel, :sshflags=>sshflags}

contrib/vagrant/README.md

@@ -40,4 +40,4 @@ downloaded during provisioning. To take advantage of these dependencies, use
 the `jlmake` alias in place of `make`.
 
 When the build is complete, you can run
-`~/julia/usr/bin/julia-release-readline` to start Julia.
+`~/julia/usr/bin/julia-readline` to start Julia.

contrib/windows/julia.bat

@@ -7,7 +7,7 @@
 pushd %cd%
 setlocal enableextensions enabledelayedexpansion
 call "%~dp0prepare-julia-env.bat" %*
-call "%JULIA_HOME%julia-release-readline.exe" %*
+call "%JULIA_HOME%julia-readline.exe" %*
 endlocal
 popd
 

contrib/windows/prepare-julia-env.bat

@@ -8,7 +8,7 @@
 
 set SYS_PATH=%PATH%
 set PATH=%~dp0bin;%~dp0usr\bin;%~dp0..\usr\bin;%~dp0..\..\usr\bin;%SYS_PATH%
-set JULIA_EXE=julia-release-readline.exe
+set JULIA_EXE=julia-readline.exe
 for %%A in (%JULIA_EXE%) do set JULIA_HOME=%%~dp$PATH:A
 set JULIA=%JULIA_HOME%%JULIA_EXE%
 set PATH=%JULIA_HOME%;%JULIA_HOME%..\lib\julia;%JULIA_HOME%..\lib;.;%SYS_PATH%;%~dp0\Git\bin;C:\MinGW\msys\1.0\bin;C:\MinGW\bin;C:\Program Files\Git\bin;C:\Program Files (x86)\Git\bin;C:\Python27;C:\Python26;C:\Python25

contrib/windows/test-julia.bat

@@ -13,7 +13,7 @@ pushd %cd%
 setlocal enableextensions enabledelayedexpansion
 call "%~dp0prepare-julia-env.bat" %*
 cd "%JULIA_HOME%..\share\julia\test"
-call "%JULIA_HOME%julia-release-readline.exe" runtests.jl %*
+call "%JULIA_HOME%julia-readline.exe" runtests.jl %*
 endlocal
 popd
 pause

src/Makefile

@@ -78,18 +78,18 @@ libjulia-debug.a: julia.expmap $(DOBJS) flisp/libflisp.a support/libsupport.a
 libjulia-debug: $(BUILD)/$(JL_LIBDIR)/libjulia-debug.$(SHLIB_EXT)
 
 ifeq ($(SHLIB_EXT), so)
-  SONAME = -Wl,-soname=libjulia-release.so
+  SONAME = -Wl,-soname=libjulia.so
 else
   SONAME =
 endif
 
-$(BUILD)/$(JL_LIBDIR)/libjulia-release.$(SHLIB_EXT): julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a $(LIBUV)
+$(BUILD)/$(JL_LIBDIR)/libjulia.$(SHLIB_EXT): julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a $(LIBUV)
 	@$(call PRINT_LINK, $(CXX) $(SHIPFLAGS) $(OBJS) $(RPATH_ORIGIN) -shared -o $@ $(LDFLAGS) $(LIBS) $(SONAME))
-	$(INSTALL_NAME_CMD)libjulia-release.$(SHLIB_EXT) $@
-libjulia-release.a: julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a
+	$(INSTALL_NAME_CMD)libjulia.$(SHLIB_EXT) $@
+libjulia.a: julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a
 	rm -f $@
 	@$(call PRINT_LINK, ar -rcs $@ $(OBJS))
-libjulia-release: $(BUILD)/$(JL_LIBDIR)/libjulia-release.$(SHLIB_EXT)
+libjulia-release: $(BUILD)/$(JL_LIBDIR)/libjulia.$(SHLIB_EXT)
 
 clean:
 	-rm -f $(BUILD)/$(JL_LIBDIR)/libjulia*

ui/Makefile

@@ -11,7 +11,8 @@ DEBUGFLAGS += $(FLAGS)
 SHIPFLAGS += $(FLAGS)
 JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(call exec,$(LLVM_CONFIG) --ldflags) $(OSLIBS) $(RPATH)
 
-julia-release julia-debug: %: %-basic %-readline
+julia-release: julia-readline julia-basic
+julia-debug: julia-debug-readline julia-debug-readline
 
 release debug:
 	$(MAKE) julia-$@
@@ -27,18 +28,18 @@ $(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$(EXE)
+julia-basic: $(BUILD)/bin/julia-basic$(EXE)
 julia-debug-basic: $(BUILD)/bin/julia-debug-basic$(EXE)
-julia-release-readline: $(BUILD)/bin/julia-release-readline$(EXE)
+julia-readline: $(BUILD)/bin/julia-readline$(EXE)
 julia-debug-readline: $(BUILD)/bin/julia-debug-readline$(EXE)
 
-$(BUILD)/bin/julia-release-basic$(EXE): repl.o repl-basic.o
-	@$(call PRINT_LINK, $(CXX) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-release)
+$(BUILD)/bin/julia-basic$(EXE): repl.o repl-basic.o
+	@$(call PRINT_LINK, $(CXX) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia)
 $(BUILD)/bin/julia-debug-basic$(EXE): repl.do repl-basic.do
 	@$(call PRINT_LINK, $(CXX) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-debug)
 
-$(BUILD)/bin/julia-release-readline$(EXE): repl.o repl-readline.o
-	@$(call PRINT_LINK, $(CXX) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ $(READLINE) -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-release) || echo "*** Please ensure that the ncurses-devel package is installed on your OS, and try again. ***"
+$(BUILD)/bin/julia-readline$(EXE): repl.o repl-readline.o
+	@$(call PRINT_LINK, $(CXX) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ $(READLINE) -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia) || echo "*** Please ensure that the ncurses-devel package is installed on your OS, and try again. ***"
 $(BUILD)/bin/julia-debug-readline$(EXE): repl.do repl-readline.do
 	@$(call PRINT_LINK, $(CXX) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ $(READLINE) -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) $(JLDFLAGS) -ljulia-debug)