Permalink
Browse files

windows release

  • Loading branch information...
1 parent 1162089 commit 6e8daa5bcdc474a7beb2be786b21d6a44c24f614 @vtjnash vtjnash committed with unknown Oct 12, 2012
Showing with 7 additions and 17 deletions.
  1. +1 −1 Makefile
  2. +3 −3 deps/nginx.conf
  3. +1 −1 dist/windows/prepare_env.bat
  4. +0 −11 test.jl
  5. 0 test.txt
  6. +2 −1 ui/webserver/Makefile
View
@@ -35,7 +35,7 @@ install: release
cp $(BUILD)/bin/*julia* $(PREFIX)/bin
cd $(PREFIX)/bin && ln -s julia-release-$(DEFAULT_REPL) julia
cp -R -L $(BUILD)/lib/julia/* $(PREFIX)/lib/julia
- -cp $(BUILD)/lib/lib{Rmath,amd,amos,arpack,cholmod,colamd,suitesparseconfig,fdm,fftw3,fftw3f,fftw3_threads,fftw3f_threads,glpk,glpk_wrapper,gmp,gmp_wrapper,grisu,history,julia-release,$(OPENBLASNAME),openlibm,pcre,random,readline,suitesparse_wrapper,umfpack,z}.$(SHLIB_EXT) $(PREFIX)/lib
+ -cp $(BUILD)/lib/lib{Rmath,amd,amos,arpack,cholmod,colamd,suitesparseconfig,fdm,fftw3,fftw3f,fftw3_threads,fftw3f_threads,glpk,glpk_wrapper,gmp,gmp_wrapper,grisu,history,julia-release,openblas,openlibm,pcre,random,readline,suitesparse_wrapper,umfpack,z}.$(SHLIB_EXT) $(PREFIX)/lib
# Web-REPL stuff
-cp $(BUILD)/lib/mod* $(PREFIX)/lib
-cp $(BUILD)/sbin/* $(PREFIX)/sbin
View
@@ -1,9 +1,9 @@
-error_log var/log/nginx.log info;
+error_log logs/nginx.log info;
events {
worker_connections 1024;
}
http {
- access_log var/log/access.log combined;
+ access_log logs/access.log combined;
types {
text/html html htm;
text/plain txt;
@@ -26,7 +26,7 @@ http {
}
location / {
- root ../ui/website;
+ root ../lib/julia/ui/website;
}
}
}
@@ -11,6 +11,6 @@ set PATH=%~dp0bin;%~dp0usr\bin;%~dp0..\usr\bin;%~dp0..\..\usr\bin
set JULIA_EXE=julia-release-readline.exe
for %%A in (%JULIA_EXE%) do set JULIA_HOME=%%~dp$PATH:A
set JULIA=%JULIA_HOME%%JULIA_EXE%
-set PATH=%JULIA_HOME..\lib;.;%SYS_PATH%;C:\MinGW\bin;C:\MinGW\lib;C:\Program Files\Git\bin;C:\Program Files (x86)\Git\bin;C:\Python27;C:\Python26
+set PATH=%JULIA_HOME%..\lib;.;%SYS_PATH%;C:\MinGW\bin;C:\MinGW\lib;C:\Program Files\Git\bin;C:\Program Files (x86)\Git\bin;C:\Python27;C:\Python26
if not exist %JULIA_HOME%..\lib\julia\sys.ji (echo "Preparing Julia for first launch. This may take a while" && cd %JULIA_HOME%..\lib\julia\base && %JULIA% -b sysimg.jl && popd && pushd %cd%)
View
11 test.jl
@@ -1,11 +0,0 @@
-for (sym, (stdin, stdout, stderr)) in {(:spawn_opts_inherit, (STDIN,STDOUT,STDERR)),
- (:spawn_opts_swallow, (null_handle,null_handle,null_handle))}
-@eval begin
- ($sym)(stdios::StdIOSet,exitcb::Callback,closecb::Callback) = (stdios,exitcb,closecb)
- ($sym)(stdios::StdIOSet,exitcb::Callback) = (stdios,exitcb,false)
- ($sym)(stdios::StdIOSet) = (stdios,false,false)
- ($sym)() = (($stdin,$stdout,$stderr),false,false)
- ($sym)(in::StreamOrNot) = ((in,$stdout,$stderr),false,false)
- ($sym)(in::StreamOrNot,out::StreamOrNot) = ((in,out,$stderr),false,false)
-end
-end
View
No changes.
View
@@ -27,7 +27,7 @@ WEBSERVER_SRCS = webserver.cpp server.cpp jsoncpp.cpp
ifeq ($(OS),WINNT)
LAUNCH_SCRIPT = launch-julia-webserver.bat
-$(USRBIN)/$(LAUNCH_SCRIPT):
+$(USRBIN)/$(LAUNCH_SCRIPT): ${JULIAHOME}/dist/windows/*.bat
cp ${JULIAHOME}/dist/windows/*.bat ${USRBIN}
else
LAUNCH_SCRIPT = launch-julia-webserver
@@ -49,3 +49,4 @@ $(USRBIN)/julia-debug-webserver: $(WEBSERVER_SRCS) server.h
clean:
rm -f *.o *.do
rm -f $(USRBIN)/julia-*-webserver
+ rm -f $(USRBIN)/*.bat

2 comments on commit 6e8daa5

Owner

Keno replied Oct 13, 2012

@vtjnash Does the binary you uploaded work fine? Can we delete the old one?

Collaborator

vtjnash replied Oct 13, 2012

Seemed OK. I was thinking of deleting the old one when someone could confirm that it works for them too. Here's the manual changes I had to do to make this zip:

  1. replace libopenblas.dll with version from previous upload (I can't get the latest version to build right)
  2. run make -C test, comment out spawn test in test/default.jl (echo and perl don't exist on windows), copy in test folder to zip
  3. add nginx binary distribution to sbin
  4. check that etc/nginx.conf is installed
  5. convert from tar.gz to zip

Biggest missing feature: wait implemented as a producer/consumer instead of a busy(-ish) wait (I'll add this as an issue)

Note: initialize_stdio() isn't called till after start_image.jl finishes, so failure there to load stuff like libopenblas.dll (which wasn't being copied to dist) causes a segfault with a randomly corrupted stack

Please sign in to comment.