Просмотр исходного кода

ci(windows): don't use relative path for includes

Stéphane Lepin 5 лет назад
Родитель
Сommit
072d2367f6
2 измененных файлов с 3 добавлено и 6 удалено
  1. 1 1
      ci/windows/package-windows.cmd
  2. 2 5
      ci/windows/prepare-windows.cmd

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

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

+ 2 - 5
ci/windows/prepare-windows.cmd

@@ -1,7 +1,4 @@
-mkdir build32
-mkdir build64
-
-call "%~dp0..\ci_includes.generated.cmd"
+call "ci\ci_includes.generated.cmd"
 
 
 cd build32
 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" ..
 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" ..
@@ -11,4 +8,4 @@ cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DQTDIR="%QT
 REM Rename the main project file to something CI can pick up independently of the project's name
 REM Rename the main project file to something CI can pick up independently of the project's name
 cd ..
 cd ..
 ren "build32\%PluginName%.sln" "build32\main.sln"
 ren "build32\%PluginName%.sln" "build32\main.sln"
-ren "build64\%PluginName%.sln" "build64\main.sln"
+ren "build64\%PluginName%.sln" "build64\main.sln"²