From d094891bb41921b8b8c28c1f4126dff55ed0760e Mon Sep 17 00:00:00 2001 From: Matthew Budd Date: Tue, 16 Jun 2020 09:12:55 -0400 Subject: [PATCH 1/8] Testing build artifact push --- pipelines/debpkg.pl | 2 +- pipelines/linux_build.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pipelines/debpkg.pl b/pipelines/debpkg.pl index 64c04735..e0960679 100755 --- a/pipelines/debpkg.pl +++ b/pipelines/debpkg.pl @@ -2,7 +2,7 @@ use strict; -my $VERSION="2.2.4"; +my $VERSION="2.2.3"; my $INSTALL_PREFIX="/tmp/fceux"; my $CTL_FILENAME="$INSTALL_PREFIX/DEBIAN/control"; my $ARCH="amd64"; diff --git a/pipelines/linux_build.sh b/pipelines/linux_build.sh index 5acd73b1..8a2f2024 100755 --- a/pipelines/linux_build.sh +++ b/pipelines/linux_build.sh @@ -112,3 +112,6 @@ echo '**************************************************************' echo 'Testing Install of Package' echo '**************************************************************' sudo dpkg -i /tmp/fceux-*.deb + +echo 'Pushing Debian Package to Build Artifacts' +appveyor PushArtifact /tmp/fceux-*.deb From 968c15f0f76761207610810c00df65d81201df04 Mon Sep 17 00:00:00 2001 From: Matthew Budd Date: Tue, 16 Jun 2020 09:38:15 -0400 Subject: [PATCH 2/8] Added windows packaging script call to appveyor config. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index ff7c0140..7690b758 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,4 +5,6 @@ image: #- Ubuntu1804 build_script: - cmd: msbuild "./vc/vc14_fceux.sln" +- cmd: ./vc/archive.bat +- cmd: appveyor PushArtifact ./vc/fceux.zip - sh: ./pipelines/linux_build.sh From fcf2135426bae005fa04cbcef037e75d317ee677 Mon Sep 17 00:00:00 2001 From: Matthew Budd Date: Tue, 16 Jun 2020 09:47:28 -0400 Subject: [PATCH 3/8] win32 build packaging pathing fixes. --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7690b758..a83085a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,8 @@ image: #- Ubuntu1804 build_script: - cmd: msbuild "./vc/vc14_fceux.sln" -- cmd: ./vc/archive.bat -- cmd: appveyor PushArtifact ./vc/fceux.zip +- cmd: cd vc +- cmd: archive.bat +- cmd: cd .. +- cmd: appveyor PushArtifact "./vc/fceux.zip" - sh: ./pipelines/linux_build.sh From bce4ea30f8a68e1ae13902aae37b36bef696fad7 Mon Sep 17 00:00:00 2001 From: Matt Budd Date: Tue, 16 Jun 2020 21:14:44 -0400 Subject: [PATCH 4/8] Added win32 build script for pipeline. --- appveyor.yml | 6 +----- pipelines/win32_build.bat | 18 ++++++++++++++++++ vc/archive.bat | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 pipelines/win32_build.bat diff --git a/appveyor.yml b/appveyor.yml index a83085a7..9337bac1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,5 @@ image: - Ubuntu2004 #- Ubuntu1804 build_script: -- cmd: msbuild "./vc/vc14_fceux.sln" -- cmd: cd vc -- cmd: archive.bat -- cmd: cd .. -- cmd: appveyor PushArtifact "./vc/fceux.zip" +- cmd: pipelines/win32_build.bat - sh: ./pipelines/linux_build.sh diff --git a/pipelines/win32_build.bat b/pipelines/win32_build.bat new file mode 100644 index 00000000..4d096e32 --- /dev/null +++ b/pipelines/win32_build.bat @@ -0,0 +1,18 @@ + +set PROJECT_ROOT=%~dp0.. + +REM echo %PROJECT_ROOT% + +msbuild %PROJECT_ROOT%\vc\vc14_fceux.vcxproj + +cd %PROJECT_ROOT%\vc + +REM Copy Executable to output directory +copy vc14_bin_Debug\fceux.exe ..\output\. + +REM Create Zip Archive +archive.bat + +cd %PROJECT_ROOT% + +appveyor PushArtifact "./vc/fceux.zip" diff --git a/vc/archive.bat b/vc/archive.bat index 5ce17a07..dc532337 100644 --- a/vc/archive.bat +++ b/vc/archive.bat @@ -5,7 +5,7 @@ IF ERRORLEVEL 1 IF NOT ERRORLEVEL 2 GOTO UPXFailed cd ..\output ..\vc\zip -X -9 -r ..\vc\fceux.zip fceux.exe fceux.chm taseditor.chm 7z.dll *.dll palettes luaScripts tools move /y ..\vc\fceux.exe . -..\vc\zip -X -9 -r ..\vc\fceux.zip auxlib.lua +REM ..\vc\zip -X -9 -r ..\vc\fceux.zip auxlib.lua cd .. REM vc\zip -X -9 -r vc\fceux.zip documentation cd vc From be6dff9d68897653b7251aa60267b2e8b081638c Mon Sep 17 00:00:00 2001 From: Matt Budd Date: Tue, 16 Jun 2020 21:23:52 -0400 Subject: [PATCH 5/8] Added 7z.dll to zipped package file. --- pipelines/win32_build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipelines/win32_build.bat b/pipelines/win32_build.bat index 4d096e32..c4a27643 100644 --- a/pipelines/win32_build.bat +++ b/pipelines/win32_build.bat @@ -7,8 +7,9 @@ msbuild %PROJECT_ROOT%\vc\vc14_fceux.vcxproj cd %PROJECT_ROOT%\vc -REM Copy Executable to output directory +REM Copy Executable and dlls to output directory copy vc14_bin_Debug\fceux.exe ..\output\. +copy vc14_bin_Debug\7z.dll ..\output\. REM Create Zip Archive archive.bat From 5e30f22381c3a41376cbf590e3a47e8d5c40dc66 Mon Sep 17 00:00:00 2001 From: Matt Budd Date: Tue, 16 Jun 2020 21:33:57 -0400 Subject: [PATCH 6/8] Trying out not using archive script and just pushing directly to appveyor artifacts --- pipelines/win32_build.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pipelines/win32_build.bat b/pipelines/win32_build.bat index c4a27643..0afdbf23 100644 --- a/pipelines/win32_build.bat +++ b/pipelines/win32_build.bat @@ -12,8 +12,10 @@ copy vc14_bin_Debug\fceux.exe ..\output\. copy vc14_bin_Debug\7z.dll ..\output\. REM Create Zip Archive -archive.bat +cd %PROJECT_ROOT% +appveyor PushArtifact output + +REM archive.bat cd %PROJECT_ROOT% -appveyor PushArtifact "./vc/fceux.zip" From 22c58e1a21e251bd75268b97079ccba4401bbd4b Mon Sep 17 00:00:00 2001 From: Matt Budd Date: Tue, 16 Jun 2020 21:45:16 -0400 Subject: [PATCH 7/8] Trying again with artifacts --- pipelines/win32_build.bat | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pipelines/win32_build.bat b/pipelines/win32_build.bat index 0afdbf23..80a7f657 100644 --- a/pipelines/win32_build.bat +++ b/pipelines/win32_build.bat @@ -12,10 +12,9 @@ copy vc14_bin_Debug\fceux.exe ..\output\. copy vc14_bin_Debug\7z.dll ..\output\. REM Create Zip Archive -cd %PROJECT_ROOT% -appveyor PushArtifact output - -REM archive.bat +archive.bat cd %PROJECT_ROOT% +appveyor PushArtifact %PROJECT_ROOT%\vc\fceux.zip + From 531afbe4040fe566d22cea4c631afca6d15e5783 Mon Sep 17 00:00:00 2001 From: Matt Budd Date: Tue, 16 Jun 2020 21:51:45 -0400 Subject: [PATCH 8/8] Trying again.... --- pipelines/win32_build.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pipelines/win32_build.bat b/pipelines/win32_build.bat index 80a7f657..7821acc9 100644 --- a/pipelines/win32_build.bat +++ b/pipelines/win32_build.bat @@ -12,7 +12,9 @@ copy vc14_bin_Debug\fceux.exe ..\output\. copy vc14_bin_Debug\7z.dll ..\output\. REM Create Zip Archive -archive.bat +REM archive.bat +cd %PROJECT_ROOT%\output +..\vc\zip -X -9 -r ..\vc\fceux.zip fceux.exe fceux.chm taseditor.chm 7z.dll *.dll palettes luaScripts tools cd %PROJECT_ROOT%