diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8da46d1ae957b30925579c55f8d73b11265e4eef..752d52bbf9799cf8a62add202f31e2ee6638b2ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,29 +157,6 @@ build-windows: - dir - copy ../packages/make-windows-dir.bat .\make-windows-dir.bat - .\make-windows-dir.bat - # # Copy Pamhyr - # - copy /y dist\pamhyr pamhyr\ - # # Copy Pamhyr info - # - copy /y ..\LICENSE pamhyr\pamhyr\ - # - copy /y ..\AUTHORS pamhyr\pamhyr\ - # - copy /y ..\VERSION pamhyr\pamhyr\ - # # Copy mage - # - mkdir pamhyr\mage - # - copy /y ..\mage-windows\* pamhyr\mage\ - # # Copy Pamhyr resources - # - mkdir pamhyr\pamhyr\View - # - mkdir pamhyr\pamhyr\View\ui - # - mkdir pamhyr\pamhyr\View\ui\Widgets - # - copy /y ..\src\View\ui\*.ui pamhyr\pamhyr\View\ui\ - # - copy /y ..\src\View\ui\ressources\ pamhyr\pamhyr\View\ui - # - copy /y ..\src\View\ui\Widgets\*.ui pamhyr\pamhyr\View\ui\Widgets - # # Copy lang - # - mkdir pamhyr\pamhyr\lang - # - copy /y ..\src\lang\*.qm pamhyr\pamhyr\lang - # # Copy tests cases - # - mkdir pamhyr\tests_cases\ - # - mkdir pamhyr\tests_cases\Saar - # - copy ..\tests_cases\Saar\Saar.pamhyr pamhyr\tests_cases\Saar\ artifacts: paths: - windows/pamhyr @@ -246,8 +223,8 @@ windows-package-exe: - windows/pamhyr-windows.exe script: - cd windows - - copy /y ..\packages\make-windows-exe.bat make-windows-exe.bat - - copy /y ..\packages\pamhyr.nsi pamhyr.nsi + - copy ..\packages\make-windows-exe.bat make-windows-exe.bat + - copy ..\packages\pamhyr.nsi pamhyr.nsi - .\make-windows-exe.bat ########### diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat index 2d7391e85eac16f09fe1fca39825f219f881942b..18f9f490559697ffe8b3cf80952ebf08a01dd877 100644 --- a/packages/make-windows-dir.bat +++ b/packages/make-windows-dir.bat @@ -17,7 +17,7 @@ rem along with this program. If not, see <https://www.gnu.org/licenses/>. @ECHO ON mkdir pamhyr\pamhyr -copy /y dist\pamhyr pamhyr\pamhyr +xcopy /y dist\pamhyr pamhyr\pamhyr rem Copy data mkdir pamhyr\pamhyr\lang