Explorar el Código

use findlib for extlib

Simon Krajewski hace 8 años
padre
commit
f330ab9468
Se han modificado 5 ficheros con 10 adiciones y 7 borrados
  1. 2 2
      .travis.yml
  2. 2 2
      Makefile
  3. 1 1
      appveyor.yml
  4. 1 1
      libs
  5. 4 1
      src/typing/typeload.ml

+ 2 - 2
.travis.yml

@@ -35,7 +35,7 @@ install_linux: &install_linux
       camlp4
   - wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin system
   - export OPAMYES=1
-  - opam install sedlex
+  - opam install sedlex camlzip xml-light extlib
   # Setup database
   - travis_retry sudo apt-get install mysql-server-5.6 -y
   - mysql -u root -e "create user travis@localhost identified by '';"
@@ -59,7 +59,7 @@ install_osx: &install_osx
   - travis_retry brew install opam;
   - export OPAMYES=1
   - opam init
-  - opam install camlp4 sedlex ocamlfind
+  - opam install camlp4 sedlex ocamlfind camlzip xml-light extlib
   - eval `opam config env`
   # Install neko
   - travis_retry brew install neko --HEAD;

+ 2 - 2
Makefile

@@ -28,8 +28,8 @@ STATICLINK?=0
 # Configuration
 
 HAXE_DIRECTORIES=compiler context generators generators/gencommon macro filters optimization syntax typing display
-EXTLIB_LIBS=extlib extc neko javalib swflib ttflib ilib objsize pcre
-FINDLIB_LIBS=unix str threads sedlex camlzip xml-light
+EXTLIB_LIBS=extlib-leftovers extc neko javalib swflib ttflib ilib objsize pcre
+FINDLIB_LIBS=unix str threads sedlex camlzip xml-light extlib
 
 # Includes, packages and compiler
 

+ 1 - 1
appveyor.yml

@@ -34,7 +34,7 @@ install:
     - 7z x "opam32.tar.xz" -so | 7z x -aoa -si -ttar
     - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && bash opam32/install.sh"'
     - '%CYG_ROOT%/bin/bash -lc "opam init mingw \"https://github.com/fdopen/opam-repository-mingw.git\" --comp 4.02.3+mingw32c --switch 4.02.3+mingw32c --auto-setup --yes"'
-    - '%CYG_ROOT%/bin/bash -lc "opam install camlp4 sedlex ocamlfind --yes"'
+    - '%CYG_ROOT%/bin/bash -lc "opam install camlp4 sedlex ocamlfind camlzip xml-light extlib --yes"'
     # Install neko
     - choco install neko --prerelease --ignore-dependencies -s 'https://ci.appveyor.com/nuget/neko' -y
     - choco install chocolatey-core.extension php --ignore-dependencies -y

+ 1 - 1
libs

@@ -1 +1 @@
-Subproject commit 11b32924639831d9db71b5bd55360ff52e4ee4a2
+Subproject commit d30bbac6476dbafee41cb6265e7ab5b61c4ce5dc

+ 4 - 1
src/typing/typeload.ml

@@ -3488,7 +3488,10 @@ let type_types_into_module ctx m tdecls p =
 	ctx
 
 let handle_import_hx ctx m decls p =
-	let path_split = List.tl (List.rev (Path.get_path_parts m.m_extra.m_file)) in
+	let path_split = match List.rev (Path.get_path_parts m.m_extra.m_file) with
+		| [] -> []
+		| _ :: l -> l
+	in
 	let join l = String.concat Path.path_sep (List.rev ("import.hx" :: l)) in
 	let rec loop path pack = match path,pack with
 		| _,[] -> [join path]