Permalink
Browse files

kill off JuliaWebRepl and nginx. add uv.a and julia.h to installed ou…

…tputs
  • Loading branch information...
1 parent 62c9a59 commit de88a2ebfa1ab3e824b9ca0bca879da6ad5a09c0 @vtjnash vtjnash committed Mar 15, 2013
Showing with 43 additions and 16,706 deletions.
  1. +0 −3 .gitmodules
  2. +5 −13 Makefile
  3. +34 −0 contrib/mac-gtk.sh
  4. +1 −4 contrib/windows/prepare-julia-env.bat
  5. +0 −1 deps/.gitignore
  6. +1 −57 deps/Makefile
  7. +1 −1 deps/libuv
  8. +0 −1 deps/nginx
  9. +0 −10 extras/Makefile
  10. +0 −241 extras/julia_web.jl
  11. +0 −219 extras/julia_web_base.jl
  12. +1 −0 src/julia.expmap
  13. +0 −5 ui/webserver/.gitignore
  14. +0 −59 ui/webserver/Makefile
  15. +0 −1,857 ui/webserver/json.h
  16. +0 −4,230 ui/webserver/jsoncpp.cpp
  17. +0 −12 ui/webserver/launch-julia-webserver
  18. +0 −39 ui/webserver/launch-julia-webserver.bat
  19. +0 −120 ui/webserver/message_types.h
  20. +0 −34 ui/webserver/nginx-win.conf
  21. +0 −35 ui/webserver/nginx.conf
  22. +0 −669 ui/webserver/server.cpp
  23. +0 −116 ui/webserver/server.h
  24. +0 −1,122 ui/webserver/webserver.cpp
  25. BIN ui/website/assets/favicon.psd
  26. BIN ui/website/assets/logo_dark.psd
  27. BIN ui/website/assets/logo_light.psd
  28. +0 −4,676 ui/website/d3.js
  29. BIN ui/website/favicon.ico
  30. BIN ui/website/images/banner.png
  31. BIN ui/website/images/bullet.png
  32. BIN ui/website/images/logo.png
  33. BIN ui/website/images/slogan.png
  34. +0 −100 ui/website/index.css
  35. +0 −36 ui/website/index.htm
  36. +0 −167 ui/website/index.js
  37. +0 −274 ui/website/jquery.autoresize.js
  38. +0 −4 ui/website/jquery.js
  39. +0 −23 ui/website/jquery.json.js
  40. +0 −26 ui/website/layout.js
  41. +0 −96 ui/website/localstorage.js
  42. +0 −1,265 ui/website/modernizr-2.5.3.js
  43. +0 −170 ui/website/repl.css
  44. +0 −52 ui/website/repl.htm
  45. +0 −920 ui/website/repl.js
  46. +0 −1 ui/website/repl.scgi
  47. +0 −48 ui/website/reset.css
View
@@ -4,9 +4,6 @@
[submodule "deps/openlibm"]
path = deps/openlibm
url = git://github.com/JuliaLang/openlibm.git
-[submodule "deps/nginx"]
- path = deps/nginx
- url = git://github.com/git-mirror/nginx
[submodule "deps/Rmath"]
path = deps/Rmath
url = git://github.com/JuliaLang/Rmath.git
View
@@ -25,7 +25,6 @@ julia-debug julia-release:
@$(MAKE) $(QUIET_MAKE) -C deps
@$(MAKE) $(QUIET_MAKE) -C src lib$@
@$(MAKE) $(QUIET_MAKE) -C base
- @$(MAKE) $(QUIET_MAKE) -C extras
@$(MAKE) $(QUIET_MAKE) -C ui $@
@ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia
@@ -55,8 +54,8 @@ JL_PRIVATE_LIBS = amd arpack cholmod colamd fftw3 fftw3f fftw3_threads \
umfpack z openblas
PREFIX ?= julia-$(JULIA_COMMIT)
-install: release webrepl
- @for subdir in "sbin" "bin" "etc" "libexec" $(JL_LIBDIR) $(JL_PRIVATE_LIBDIR) "share/julia" ; do \
+install: release
+ @for subdir in "bin" "libexec" $(JL_LIBDIR) $(JL_PRIVATE_LIBDIR) "share/julia" "include/julia" ; do \
mkdir -p $(PREFIX)/$$subdir ; \
done
ifeq ($(OS), Darwin)
@@ -72,11 +71,12 @@ endif
-for suffix in $(JL_PRIVATE_LIBS) ; do \
cp -a $(BUILD)/lib/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
done
+ cp -a $(BUILD)/lib/libuv.a $(PREFIX)/$(JL_PRIVATE_LIBDIR)
+ cp -a src/julia.h $(BUILD)/include/uv* $(PREFIX)/include/julia
# Copy system image
cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji $(PREFIX)/$(JL_PRIVATE_LIBDIR)
# Copy in all .jl sources as well
cp -R -L $(BUILD)/share/julia $(PREFIX)/share/
- -cp $(BUILD)/etc/nginx.conf $(PREFIX)/etc/
ifeq ($(OS), WINNT)
-cp $(JULIAHOME)/contrib/windows/* $(PREFIX)
endif
@@ -91,7 +91,6 @@ ifeq ($(OS), Darwin)
-./contrib/fixup-libgfortran.sh $(PREFIX)/$(JL_PRIVATE_LIBDIR)
endif
ifeq ($(OS), WINNT)
- cp -R $(BUILD)/sbin $(PREFIX)
-[ -e dist-extras/7za.exe ] && cp dist-extras/7za.exe $(PREFIX)/bin/7z.exe
-[ -e dist-extras/PortableGit-1.8.0-preview20121022.7z ] && \
mkdir $(PREFIX)/Git && \
@@ -113,7 +112,6 @@ endif
clean: | $(CLEAN_TARGETS)
@$(MAKE) -C base clean
- @$(MAKE) -C extras clean
@$(MAKE) -C src clean
@$(MAKE) -C ui clean
@for buildtype in "release" "debug" ; do \
@@ -131,7 +129,7 @@ cleanall: clean
# @$(MAKE) -C deps clean-uv
.PHONY: default debug release julia-debug julia-release \
- test testall test-* clean cleanall webrepl \
+ test testall test-* clean cleanall \
run-julia run-julia-debug run-julia-release
test: release
@@ -143,12 +141,6 @@ testall: release
test-%: release
@$(MAKE) $(QUIET_MAKE) -C test $*
-webrepl: all
-ifeq ($(USE_SYSTEM_NGINX), 0)
- @$(MAKE) $(QUIET_MAKE) -C deps install-nginx
-endif
- @$(MAKE) -C ui/webserver julia-release
-
# download target for some hardcoded windows dependencies
.PHONY: win-extras
win-extras:
View
@@ -0,0 +1,34 @@
+#/bin/sh
+
+# This script will attempt to download and build GTK+-3,
+# including dependencies, in ~/gtk (also puts stuff in
+# ~/.local, ~/Source, ~/.jhbuildrc*)
+# While this should work, it may be preferable to execute
+# each line separately in the terminal
+
+curl -O https://raw.github.com/jralls/gtk-osx-build/master/gtk-osx-build-setup.sh
+sh gtk-osx-build-setup.sh
+export PATH=$PATH:~/.local/bin/
+sed -i -e 's/^setup_sdk/#setup_sdk/g' ~/.jhbuildrc-custom
+cat << EOF >> .jhbuildrc-custom
+setup_sdk(target=_target, sdk_version=_target, architectures=[_default_arch])
+os.environ["DYLD_LIBRARY_PATH"] = ""
+build_policy = "updated-deps"
+modules = [ "meta-gtk-osx-bootstrap",
+ "freetype", "fontconfig",
+ "meta-gtk-osx-core",
+ "meta-gtk-osx-themes",
+ "gtk-quartz-engine" ]
+EOF
+
+jhbuild bootstrap --skip=libiconv --ignore-system
+jhbuild build
+
+cd ~/gtk/source
+curl -O http://ftp.gnome.org/pub/gnome/sources/gtk-mac-bundler/0.6/gtk-mac-bundler-0.6.1.tar.bz2
+tar jxvf gtk-mac-bundler-0.6.1.tar.bz2
+cd gtk-mac-bundler-0.6.1
+make install
+cd ~/gtk
+
+
@@ -7,7 +7,7 @@
@rem
set SYS_PATH=%PATH%
-set PATH=%~dp0bin;%~dp0usr\bin;%~dp0..\usr\bin;%~dp0..\..\usr\bin
+set PATH=%~dp0bin;%~dp0usr\bin;%~dp0..\usr\bin;%~dp0..\..\usr\bin;%SYS_PATH%
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%
@@ -16,7 +16,4 @@ set HOME=%APPDATA%\julia
set JL_PRIVATE_LIBDIR=lib\julia
set JULIA_EDITOR=start
-@rem for issue #2124:
-set OPENBLAS_NUM_THREADS=1
-
if not exist "%JULIA_HOME%..\lib\julia\sys.ji" (echo "Preparing Julia for first launch. This may take a while" && echo "You may see two git related errors. This is completely normal" && cd "%JULIA_HOME%..\share\julia\base" && "%JULIA%" -b sysimg.jl && popd && pushd "%cd%")
View
@@ -14,7 +14,6 @@
/libunwind-*
/lighttpd-*
/llvm-*
-/nginx-*
/openblas-*
/patchelf-*
/pcre-*
View
@@ -385,7 +385,7 @@ $(UV_OBJ_TARGET): $(UV_OBJ_SOURCE)
cp -r libuv/include/* $(BUILD)/include
clean-uv:
- -$(MAKE) -C libuv clean uname_S=$(uname_S)
+ -$(MAKE) clean $(LIBUV_MAKE_FLAGS)
-rm -rf $(BUILD)/lib/libuv.a $(BUILD)/include/uv.h $(BUILD)/include/uv-private
distclean-uv: clean-uv
@@ -1095,62 +1095,6 @@ get-unwind: libunwind-$(UNWIND_VER).tar.gz
configure-unwind: libunwind-$(UNWIND_VER)/config.status
compile-unwind: $(LIBUNWIND_TARGET_SOURCE)
check-unwind: libunwind-$(UNWIND_VER)/checked
-install-unwind: $(LIBUNWIND_TARGET_OBJ)
-
-
-## NGINX ##
-
-ifneq ($(OS), WINNT)
-NGINX_OBJ_TARGET = $(BUILD)/sbin/nginx
-NGINX_SRC_TARGET = nginx/objs/nginx
-NGINX_FLAGS = --with-ld-opt="-L'$(BUILD)/lib' -lpcre -Wl,-rpath,'$(BUILD)/lib' $(RPATH)"
-
-nginx/.gitignore:
- rm -f $@
- for x in .gitignore Makefile config.status objs; do echo /$$x >> $@; done
-nginx/auto/configure: | compile-pcre
- (cd .. && git submodule update --init)
- touch -c $@
-nginx/config.status: nginx/auto/configure nginx/.gitignore
- cd nginx && \
- ./auto/configure --without-http_gzip_module --without-http_rewrite_module $(NGINX_FLAGS) --with-debug --prefix=".."
- echo 1 > $@
-$(NGINX_SRC_TARGET): nginx/config.status nginx/.gitignore
- $(MAKE) -C nginx
- touch -c $@
-$(NGINX_OBJ_TARGET): $(NGINX_SRC_TARGET) nginx/.gitignore
- $(MAKE) -C nginx install DESTDIR="$(abspath $(BUILD)/bin)/"
- touch -c $@
-
-clean-nginx:
- -$(MAKE) -C nginx clean
-distclean-nginx:
- -rm -rf nginx
-
-get-nginx: nginx/auto/configure
-configure-nginx: nginx/config.status
-compile-nginx: $(NGINX_SRC_TARGET)
-check-nginx: $(NGINX_SRC_TARGET)
-install-nginx: $(NGINX_OBJ_TARGET)
-else
-NGINX_VER=1.2.6
-NGINX_SRC_TARGET = nginx-$(NGINX_VER).zip
-NGINX_OBJ_TARGET = nginx-$(NGINX_VER)/nginx.exe
-$(NGINX_SRC_TARGET):
- $(WGET) http://nginx.org/download/$@
-$(NGINX_OBJ_TARGET): $(NGINX_SRC_TARGET)
- unzip $<
- touch -c $@
-$(BUILD)/sbin/nginx.exe: $(NGINX_OBJ_TARGET)
- mkdir -p $(BUILD)/sbin
- cp -a nginx-$(NGINX_VER)/* $(BUILD)/sbin
- touch -c $@
-get-nginx: $(NGINX_SRC_TARGET)
-configure-nginx: get-nginx
-compile-nginx: $(NGINX_OBJ_TARGET)
-check-nginx: compile-nginx
-install-nginx: $(BUILD)/sbin/nginx.exe
-endif
## GMP ##
Submodule libuv updated 1 files
+2 −0 src/unix/internal.h
Submodule nginx deleted from e02359
View
@@ -1,10 +0,0 @@
-JULIAHOME = $(abspath ..)
-include $(JULIAHOME)/Make.inc
-
-all: webrepl_msgtypes_h.jl
-
-webrepl_msgtypes_h.jl: ../ui/webserver/message_types.h
- $(QUIET_PERL) $(CC) -E -Dnotdefined $^ > $@
-
-clean:
- rm -f webrepl_msgtypes_h.jl
Oops, something went wrong.

0 comments on commit de88a2e

Please sign in to comment.