Permalink
Browse files

add files to allow for packaging on teamcity

add initial appveyor script

add submodule update before build

add msbuild cmd

remove msbuild cmd

make script runnable locally

add solution without wxwdigets

add initial appveyor script

add submodule update before build

add msbuild cmd

remove msbuild cmd

add packaging step to appveyor

add ftp upload test

use msbuild explicitly

doesn't seem to work otherwise

temporarily remove deploy script

temporarily remove build script

remove non-essential stuff

add back some stuff

set artifact path

update artifact stuff

try to add back deploy

add build step again, *sigh*

add some more build settings

add build sript style build again

download wxwidgets instead of building

remove quite flag for debugging

add cert igonre to download

dont redundantly add folder

use a seperate solution without wxwidgets dependencies

only use the rpcs3 7z as artifact

to avoid re-packaging wxwidgets, also comment out deployment, since I don't have acccess to the main account to add secure strings

Conflicts:
	package.bat
  • Loading branch information...
1 parent f232351 commit dd382b2afc941f0bdc9f2c1239f19c52a7d4bdb5 @Bigpet Bigpet committed Jul 4, 2014
Showing with 114 additions and 4 deletions.
  1. +56 −0 appveyor.yml
  2. +4 −4 package.bat
  3. +54 −0 rpcs3_buildbot.sln
View
@@ -0,0 +1,56 @@
+
+
+# version format
+version: 0.1.{build}
+
+branches:
+ only:
+ - appveyorbuild
+ # blacklist
+ #except:
+ # - gh-pages
+
+#---------------------------------#
+# environment configuration #
+#---------------------------------#
+
+# clone directory
+clone_folder: c:\projects\rpcs3
+
+platform:
+ - x64
+
+configuration:
+ - Release
+
+install:
+ - cmd: cinst wget -x86
+ - cmd: cinst 7zip.commandline -x86
+ - cmd: git submodule update --init --recursive .\ffmpeg .\asmjit
+ - cmd: wget -q --no-check-certificate https://googledrive.com/host/0B3tDmChwjRbRTTdhaTFOeGN1eEU/wxWidgets.7z -O c:\projects\rpcs3\wxwidgets.7z
+ - cmd: 7z x C:\projects\rpcs3\wxwidgets.7z -oc:\projects\rpcs3\wxWidgets
+
+build:
+
+build_script:
+ - msbuild /m /p:Configuration=Release rpcs3_buildbot.sln
+
+after_build:
+ - cmd: package.bat
+
+artifacts:
+ - path: .\rpcs3*.7z
+
+deploy: OFF
+# - provider: FTP
+# server:
+# secure: kZT7rsbEPGQ0fC2GFRBGfL2vPwUgih2JkwjbSuw00T8=
+# username:
+# secure: YJzwsi4wfSezFLqaB9uiww==
+# password:
+# secure: EQ3xa2LoRgelAdE57+qakQ==
+# folder: .\rpcs3\
+# enable_ssl: false
+
+test: OFF
+
View
@@ -5,16 +5,16 @@ copy bin\soft-oal.dll build\rpcs3
copy bin\make_fself.cmd build\rpcs3
mkdir build\rpcs3\dev_hdd1
-xcopy /Y /e bin\dev_hdd1 build\rpcs3\dev_hdd1
+xcopy /e bin\dev_hdd1 build\rpcs3\dev_hdd1
mkdir build\rpcs3\dev_hdd0
-xcopy /Y /e bin\dev_hdd0 build\rpcs3\dev_hdd0
+xcopy /e bin\dev_hdd0 build\rpcs3\dev_hdd0
mkdir build\rpcs3\dev_flash
-xcopy /Y /e bin\dev_flash build\rpcs3\dev_flash
+xcopy /e bin\dev_flash build\rpcs3\dev_flash
mkdir build\rpcs3\dev_usb000
-xcopy /Y /e bin\dev_usb000 build\rpcs3\dev_usb000
+xcopy /e bin\dev_usb000 build\rpcs3\dev_usb000
for /f "delims=" %%a in ('git describe') do @set gitrev=%%a
View
@@ -0,0 +1,54 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.30501.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AC40FF01-426E-4838-A317-66354CEFAE88} = {AC40FF01-426E-4838-A317-66354CEFAE88}
+ {C4A10229-4712-4BD2-B63E-50D93C67A038} = {C4A10229-4712-4BD2-B63E-50D93C67A038}
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stblib", "stblib", "{9D839DFB-76E6-4F10-8EED-BA2AC7CC3FB6}"
+ ProjectSection(SolutionItems) = preProject
+ stblib\stb_image.c = stblib\stb_image.c
+ stblib\stb_image.h = stblib\stb_image.h
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asmjit", "asmjit", "{E2A982F2-4B1A-48B1-8D77-A17A589C58D7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vcxproj", "{C4A10229-4712-4BD2-B63E-50D93C67A038}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug - MemLeak|x64 = Debug - MemLeak|x64
+ Debug|x64 = Debug|x64
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64
+ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
+ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64
+ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64
+ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64
+ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64
+ {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
+ {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.ActiveCfg = Debug|x64
+ {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.Build.0 = Debug|x64
+ {AC40FF01-426E-4838-A317-66354CEFAE88}.Release|x64.ActiveCfg = Release|x64
+ {AC40FF01-426E-4838-A317-66354CEFAE88}.Release|x64.Build.0 = Release|x64
+ {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64
+ {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
+ {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.ActiveCfg = Debug|x64
+ {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.Build.0 = Debug|x64
+ {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.ActiveCfg = Release|x64
+ {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {AC40FF01-426E-4838-A317-66354CEFAE88} = {E2A982F2-4B1A-48B1-8D77-A17A589C58D7}
+ EndGlobalSection
+EndGlobal

0 comments on commit dd382b2

Please sign in to comment.