tmp

tobil4sk · Sep 3, 2024 · 9064499 · 9064499
1 parent ffe4d78
commit 9064499
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -99,7 +99,7 @@ jobs:
         run: |
           Set-PSDebug -Trace 1
           & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -s -f Makefile.win -j`nproc` haxe 2>&1')
-          & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -s -f Makefile.win haxelib 2>&1')
+          & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -f Makefile.win haxelib 2>&1')
           & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && opam config exec -- make -f Makefile.win echo_package_files package_bin package_installer_win package_choco 2>&1')
           dir out
           & "$($env:CYG_ROOT)/bin/bash.exe" @('-lc', 'cd "$OLDPWD" && cygcheck ./haxe.exe')

diff --git a/Makefile b/Makefile
@@ -108,11 +108,14 @@ HAXE_STD_PATH=$(CURDIR)/std
 HAXELIB_SRC_PATH=$(CURDIR)/extra/haxelib_src
 
 $(HAXELIB_SRC_PATH)/haxelib_hxb.zip:
-	HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
-		each.hxml --interp haxelib.client.Main --hxb haxelib_hxb.zip
+	HAXE_STD_PATH=$(HAXE_STD_PATH) $(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
+		each.hxml --interp haxelib.client.Main
 
-HAXELIB_INTERP=HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) \
-	--hxb-lib $(HAXELIB_SRC_PATH)/haxelib_hxb.zip \
+# --hxb haxelib_hxb.zip
+
+HAXELIB_INTERP=HAXE_STD_PATH=$(HAXE_STD_PATH) $(HAXE_OUTPUT) \
+	--cwd $(HAXELIB_SRC_PATH) each.hxml --run haxelib.client.Main
+# --hxb-lib $(HAXELIB_SRC_PATH)/haxelib_hxb.zip \
 	--run haxelib.client.Main
 
 HXCPP_LIBPATH = `$(HAXELIB_INTERP) libpath hxcpp | tr -d '\r'`
@@ -122,15 +125,15 @@ haxelib_hxcpp: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip
 	$(HAXELIB_INTERP) path hxcpp > /dev/null || \
 		($(HAXELIB_INTERP) git hxcpp https://github.com/HaxeFoundation/hxcpp.git && \
 		hxcpp_path=$(HXCPP_LIBPATH) && \
-		$(CURDIR)/$(HAXE_OUTPUT) --cwd $$hxcpp_path/tools/hxcpp compile.hxml)
+		$(HAXE_OUTPUT) --cwd $$hxcpp_path/tools/hxcpp compile.hxml)
 
 # haxelib should depends on haxe, but we don't want to do that...
 # since haxelib isn't available in PATH yet, we have to pass -D no-compilation and build manually
 haxelib: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip haxelib_hxcpp
 	hxcpp_path=$(HXCPP_LIBPATH) \
-	HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
+	HAXE_STD_PATH=$(HAXE_STD_PATH) $(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
 		client_cpp.hxml -D destination=../../../../$(HAXELIB_OUTPUT) -D no-compilation -D hxcpp.path=$$hxcpp_path
-	$(HAXELIB_INTERP) --cwd $(HAXELIB_SRC_PATH)/bin/cpp run hxcpp Build.xml haxe
+	$(HAXELIB_INTERP) --cwd $(HAXELIB_SRC_PATH)/bin/cpp run hxcpp_ Build.xml haxe
 
 tools: haxelib