ソースを参照

ci(windows): fix prepare script

Stéphane Lepin 5 年 前
コミット
17a920905c
3 ファイル変更11 行追加13 行削除
  1. 2 2
      ci/ci_includes.cmd.in
  2. 2 2
      ci/windows/package-windows.cmd
  3. 7 9
      ci/windows/prepare-windows.cmd

+ 2 - 2
ci/ci_includes.cmd.in

@@ -1,2 +1,2 @@
-set PluginName="@CMAKE_PROJECT_NAME@"
-set PluginVersion="@CMAKE_PROJECT_VERSION@"
+set PluginName=@CMAKE_PROJECT_NAME@
+set PluginVersion=@CMAKE_PROJECT_VERSION@

+ 2 - 2
ci/windows/package-windows.cmd

@@ -1,8 +1,8 @@
+call "%~dp0..\ci_includes.generated.cmd"
+
 mkdir package
 cd package
 
-call "ci\ci_includes.generated.cmd"
-
 git rev-parse --short HEAD > package-version.txt
 set /p PackageVersion=<package-version.txt
 del package-version.txt

+ 7 - 9
ci/windows/prepare-windows.cmd

@@ -1,11 +1,9 @@
-call "ci\ci_includes.generated.cmd"
+call "%~dp0..\ci_includes.generated.cmd"
 
-cd build32
-cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR32%" -DLibObs_DIR="%OBSPath%\build32\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
-cd ..\build64
-cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR64%" -DLibObs_DIR="%OBSPath%\build64\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
+REM cd build32
+REM cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR32%" -DLibObs_DIR="%OBSPath%\build32\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
+REM ren "%PluginName%.sln" "main.sln"
 
-REM Rename the main project file to something CI can pick up independently of the project's name
-cd ..
-ren "build32\%PluginName%.sln" "build32\main.sln"
-ren "build64\%PluginName%.sln" "build64\main.sln"²
+REM cd ..\build64
+REM cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QTDIR64%" -DLibObs_DIR="%OBSPath%\build64\libobs" -DLIBOBS_INCLUDE_DIR="%OBSPath%\libobs" -DLIBOBS_LIB="%OBSPath%\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="%OBSPath%\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
+ren "%PluginName%.sln" "main.sln"