Revert install.bat

c3lang · Jul 4, 2024 · 62cd8dd · 62cd8dd
1 parent 9bb3bfd
commit 62cd8dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,4 +49,4 @@ jobs:
             uses: softprops/action-gh-release@v1
             if: startsWith(github.ref, 'refs/tags/')
             with:
-                files: ${{steps.BUILD.outputs.DEPLOY_FILE}}
+                files: ${{steps.BUILD.outputs.DEPLOY_FILE}}
diff --git a/install.bat b/install.bat
@@ -7,19 +7,12 @@ if not exist %WORKING_DIR% mkdir %WORKING_DIR%
 if /i "%BUILD_MASTER%" == "true" (
 	git clone --depth=1 %LLVM_MASTER_URL% %WORKING_DIR%\llvm-git
 	move %WORKING_DIR%\llvm-git\llvm %WORKING_DIR%
-	if exist %WORKING_DIR%\llvm-git\cmake move %WORKING_DIR%\llvm-git\cmake %WORKING_DIR%
 ) else (
 	powershell "Invoke-WebRequest -Uri %LLVM_DOWNLOAD_URL% -OutFile %WORKING_DIR%\%LLVM_DOWNLOAD_FILE%"
 	7z x -y %WORKING_DIR%\%LLVM_DOWNLOAD_FILE% -o%WORKING_DIR%
-	7z x -y %WORKING_DIR%\llvm-%LLVM_VERSION%.src.tar -o%WORKING_DIR%
-	ren %WORKING_DIR%\llvm-%LLVM_VERSION%.src llvm
-
-	if not "%LLVM_CMAKE_DOWNLOAD_URL%" == "" (
-		powershell "Invoke-WebRequest -Uri %LLVM_CMAKE_DOWNLOAD_URL% -OutFile %WORKING_DIR%\%LLVM_CMAKE_DOWNLOAD_FILE%"
-		7z x -y %WORKING_DIR%\%LLVM_CMAKE_DOWNLOAD_FILE% -o%WORKING_DIR%
-		7z x -y %WORKING_DIR%\cmake-%LLVM_VERSION%.src.tar -o%WORKING_DIR%
-		ren %WORKING_DIR%\cmake-%LLVM_VERSION%.src cmake
-	)
+	7z x -y %WORKING_DIR%\llvm-project-%LLVM_VERSION%.src.tar -o%WORKING_DIR%
+	move %WORKING_DIR%\llvm-project-%LLVM_VERSION%.src %WORKING_DIR%\llvm-project
+	dir %WORKING_DIR%
 )
 
 if "%CONFIGURATION%" == "Debug" goto dbg
@@ -33,9 +26,10 @@ goto :eof
 
 :dbg
 
-echo set_target_properties(llvm-config PROPERTIES EXCLUDE_FROM_ALL FALSE) >> %WORKING_DIR%\llvm\tools\llvm-config\CMakeLists.txt
-echo install(TARGETS llvm-config RUNTIME DESTINATION bin) >> %WORKING_DIR%\llvm\tools\llvm-config\CMakeLists.txt
+echo set_target_properties(llvm-config PROPERTIES EXCLUDE_FROM_ALL FALSE) >> %WORKING_DIR%\llvm-project\llvm\tools\llvm-config\CMakeLists.txt
+echo install(TARGETS llvm-config RUNTIME DESTINATION bin) >> %WORKING_DIR%\llvm-project\llvm\tools\llvm-config\CMakeLists.txt
 
-perl pdb-patch.pl %WORKING_DIR%\llvm\cmake\modules\AddLLVM.cmake
+perl pdb-patch.pl %WORKING_DIR%\llvm-project\llvm\cmake\modules\AddLLVM.cmake
+
+goto :eof
 
-::..............................................................................