diff --git a/common/vsprops/BaseProperties.props b/common/vsprops/BaseProperties.props index b872bd2607..0f8385d3f8 100644 --- a/common/vsprops/BaseProperties.props +++ b/common/vsprops/BaseProperties.props @@ -24,9 +24,6 @@ true Windows - - .\postBuild.cmd "$(TargetPath)" "$(TargetName)" $(TargetExt) $(PcsxSubsection) - "$(SvnCommonDir)\vsprops\preBuild.cmd" "$(ProjectRootDir)" diff --git a/common/vsprops/postBuild.unknown b/common/vsprops/postBuild.unknown deleted file mode 100644 index 6ac7841887..0000000000 --- a/common/vsprops/postBuild.unknown +++ /dev/null @@ -1,49 +0,0 @@ -::@echo off -:: -:: Usage: postBuild.cmd SourcePath DestFile DestExt {plugins} -:: -:: SourcePath - $(TargetPath) - Fully qualified path of the generated target file. -:: DestFile - Base filename of the target/dest, without extension! -:: DestExt - Extension of the target/dest! -:: plugins - optional parameter used to generate plugins into the /plugins folder -:: -:: The destination file is determined by the PCSX2_TARGET_DIR environment var. - -SETLOCAL ENABLEEXTENSIONS -if defined PCSX2_TARGET_COPY CALL :TestAndCopy "%PCSX2_TARGET_COPY%" %1 %2 %3 %4 -ENDLOCAL -exit 0 - -if exists postBuild.inc.cmd call postBuild.inc.cmd - -:TestAndCopy -:: Subroutine. First parameter is our Target Dir. Since it's a parameter into -:: the subroutine, we can use tilda expansion to handle quotes correctly. :) - -if NOT EXIST "%~1" ( - md "%~1" -) - -:: Error checking. Try to change to the dir. If it fails, it means the dir is -:: actually a file, and we should cancel the script. - -set mycwd="%CD%" -cd "%~1" -if %ERRORLEVEL% NEQ 0 goto :eof -cd %mycwd% - -set pcsxoutdir=%~1\%~5 -set pcsxoutname=%pcsxoutdir%\%~3%4 - -IF NOT EXIST "%pcsxoutdir%" ( - md "%pcsxoutdir%" -) - -copy /Y "%~2" "%pcsxoutname%" -if %ERRORLEVEL% EQU 0 ( - echo Target copied to %pcsxoutname% -) - -goto :eof - -:quit diff --git a/common/vsprops/preBuild.cmd b/common/vsprops/preBuild.cmd index 9f5c6979e2..d68dd68955 100644 --- a/common/vsprops/preBuild.cmd +++ b/common/vsprops/preBuild.cmd @@ -37,15 +37,11 @@ if %ERRORLEVEL% NEQ 0 ( echo #define SVN_REV_UNKNOWN > "%CD%\svnrev.h" echo #define SVN_REV 0ll >> "%CD%\svnrev.h" echo #define SVN_MODS 0 >> "%CD%\svnrev.h" - echo set SVN_REV=0 > "%CD%\postBuild.inc.cmd" ) else ( echo #define SVN_REV %REV%ll > "%CD%\svnrev.h" echo #define SVN_MODS 0 /* Not implemented at the moment. */ >> "%CD%\svnrev.h" - echo set SVN_REV=%REV% > "%CD%\postBuild.inc.cmd" ) -copy /Y "%mydir%\postBuild.unknown" "%CD%\postBuild.cmd" - ENDLOCAL :: Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed. exit /B 0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl b/plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl deleted file mode 100644 index 49e9699b1c..0000000000 --- a/plugins/zerogs/opengl/Win32/vsprops/postBuild.tmpl +++ /dev/null @@ -1,24 +0,0 @@ -@echo off -rem -rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt -rem -rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. -rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. -rem DestFile - Base filename of the target/dest, without extension! -rem DestExt - Extension of the target/dest! - -set pcsxoutdir=%~2\bin\plugins -set pcsxoutname=%pcsxoutdir%\%~3%4 -set pcsxnewname=%pcsxoutdir%\%~3-r$WCREV$$WCMODS?m:$%4 - -IF NOT EXIST %pcsxoutdir% ( - md %pcsxoutdir% -) - -copy /Y %~1 %pcsxoutname% -copy /Y %~1 %pcsxnewname% - -if ERRORLEVEL 0 ( - echo Target copied to %pcsxnewname% -) -exit 0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown b/plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown deleted file mode 100644 index 92d63feadf..0000000000 --- a/plugins/zerogs/opengl/Win32/vsprops/postBuild.unknown +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -rem -rem Usage: postBuild.cmd SourcePath DestDir DestFile DestExt -rem -rem SourcePath - $(TargetPath) - Fully qualified path of the generated target file. -rem DestDir - $(SolutionDir) - Directory of the destination, usually the same as the solution. -rem DestFile - Base filename of the target/dest, without extension! -rem DestExt - Extension of the target/dest! - -set pcsxoutdir=%~2\bin\plugins -set pcsxoutname=%pcsxoutdir%%~3%4 - -IF NOT EXIST %pcsxoutdir% ( - md %pcsxoutdir% -) - -copy /Y %~1 %pcsxoutname% -if ERRORLEVEL 0 ( - echo Target copied to %pcsxoutname% -) -set ERRORLEVEL=0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd b/plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd deleted file mode 100644 index ccc0214b47..0000000000 --- a/plugins/zerogs/opengl/Win32/vsprops/preBuild.cmd +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem Usage: preBuild.cmd ProjectSrcDir VspropsDir -rem -rem ProjectSrcDir - $(ProjectDir)\.. - Directory of project source code. -rem VspropsDir - $(PrjectDir)\vsprops - Directory of this script and its counterparts. - -SubWCRev.exe %~1 %~2\svnrev_template.h %~1\svnrev.h -if %ERRORLEVEL% NEQ 0 ( - echo Automatic revision update unavailable, using generic template instead. - echo You can safely ignore this message - see svnrev.h for details. - copy /Y %~2\svnrev_unknown.h %~1\svnrev.h - copy /Y %~2\postBuild.unknown %~2\postBuild.cmd -) else ( - SubWCRev.exe %~1 %~2\postBuild.tmpl %~2\postBuild.cmd -) - -rem Always return an errorlevel of 0 -- this allows compilation to continue if SubWCRev failed. - -exit 0 diff --git a/plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h b/plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h deleted file mode 100644 index f2656ef1e8..0000000000 --- a/plugins/zerogs/opengl/Win32/vsprops/svnrev_template.h +++ /dev/null @@ -1,18 +0,0 @@ -// svnrev_template.h --> svnrev.h -// -// This file acts as a template for the automatic SVN revision/version tag. -// It is used by the utility SubWCrev.exe to create an "svnrev.h" file for -// whichever project is being compiled (as indicated by command line options -// passed to SubWCRev.exe during the project's pre-build step). -// -// The SubWCRev.exe utility is part of TortoiseSVN and requires several DLLs -// installed by TortoiseSVN, so it will only be available if you have TortoiseSVN -// installed on your system. If you do not have it installed, a generic template -// is used instead (see svnrev_generic.h). Having TortoiseSVN is handy but not -// necessary. If you do not have it installed, everything will still compile -// fine except without the SVN revision tagged to the application/dll version. -// -// TortoiseSVN can be downloaded from http://tortoisesvn.tigris.org - -#define SVN_REV $WCREV$ -#define SVN_MODS $WCMODS?1:0$ \ No newline at end of file diff --git a/plugins/zerogs/opengl/Win32/vsprops/svnrev_unknown.h b/plugins/zerogs/opengl/Win32/vsprops/svnrev_unknown.h deleted file mode 100644 index 684d5f9240..0000000000 --- a/plugins/zerogs/opengl/Win32/vsprops/svnrev_unknown.h +++ /dev/null @@ -1,23 +0,0 @@ -// svnrev_genric.h --> svnrev.h -// -// This file acts as a placebo for people who do not have TortoiseSVN installed. -// It provides "empty" revision information to the Pcsx2 Playground projects in -// the absence of real revisions derived from the repository being built. -// -// This file does not affect application/dll builds in any significant manner, -// other than the lack of automatic revision tags inserted into the app (which -// is very convenient but hardly necessary). -// -// See svn_template.h for more information on how the process of revision -// templating works. -// -// If you would like to enable automatic revisin tagging, TortoiseSVN can be -// downloaded from http://tortoisesvn.tigris.org - -#define SVN_REV_UNKNOWN - -// The following defines are included so that code will still compile even if it -// doesn't check for the SVN_REV_UNKNOWN define. - -#define SVN_REV 0 -#define SVN_MODS ""