Merge branch 'development'

appveyor.yml

@@ -4,5 +4,5 @@ image:
 - Ubuntu2004
   #- Ubuntu1804
 build_script:
-- cmd: msbuild "./vc/vc14_fceux.sln"
+- cmd: pipelines/win32_build.bat
 - sh: ./pipelines/linux_build.sh

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";

pipelines/linux_build.sh

@@ -113,3 +113,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

pipelines/win32_build.bat

@@ -0,0 +1,22 @@
+
+set PROJECT_ROOT=%~dp0..
+
+REM echo %PROJECT_ROOT%
+
+msbuild %PROJECT_ROOT%\vc\vc14_fceux.vcxproj
+
+cd %PROJECT_ROOT%\vc
+
+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
+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%
+
+appveyor  PushArtifact  %PROJECT_ROOT%\vc\fceux.zip
+

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