Permalink
Browse files

Removed additional references to SVN

  • Loading branch information...
1 parent acd775f commit f3babe955aa4d3e53db1f1b87fea65f0bc51b3ba @arion-p arion-p committed Nov 14, 2011
View
4 Tools/InstallationScripts/include-MP-PreBuild.bat
@@ -1,8 +1,8 @@
@echo off
-rem That file is a workaround to use the %errorlevel% returned by DeployVersionSVN.exe in NSIS.
+rem That file is a workaround to use the %errorlevel% returned by DeployVersionGIT.exe in NSIS.
rem It is necessary, because NSIS' own compile time command
-rem !system '"Debug\DeployVersionSVN.exe" /GetVersion /svn=%cd%'
+rem !system '"Debug\DeployVersionGIT.exe" /GetVersion /path=%cd%'
rem is not able to write the exit code (%errorlevel%) to a variable.
rem It is only available to compare the exit code.
View
8 Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
@@ -54,7 +54,7 @@
!define VER_DEBUG ""
!endif
-!if ${VER_BUILD} != 0 # it's a svn release
+!if ${VER_BUILD} != 0 # it's a snapshot release
!ifdef BRANCH
!if "${BRANCH}" != ""
!define VER_BRANCH " (${BRANCH} branch)"
@@ -71,10 +71,10 @@
!define VER_COMMITTISH "-g${COMMITTISH}"
!endif
- !define VER_SVN "-${VER_BUILD}${VER_COMMITTISH}${VER_BRANCH}${VER_DEBUG} for TESTING ONLY"
+ !define VER_GIT "-${VER_BUILD}${VER_COMMITTISH}${VER_BRANCH}${VER_DEBUG} for TESTING ONLY"
!else
- !define VER_SVN ""
+ !define VER_GIT ""
!endif
-!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}${SPC}${VER_TYPE}${VER_SVN}"
+!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}${SPC}${VER_TYPE}${VER_GIT}"
View
8 Tools/InstallationScripts/languages/English.nsh
@@ -89,15 +89,15 @@ _____________________________________________________________________________
!insertmacro LANG_STRING TEXT_MSGBOX_ERROR_REBOOT_REQUIRED "A reboot is required after a previous action. Reboot you system and try it again."
!insertmacro LANG_STRING TEXT_MSGBOX_ERROR_UPDATE_BUT_NOT_INSTALLED "${PRODUCT_NAME} is not installed. It is not possible to install this update.$\r$\n$\r$\n$(TEXT_MSGBOX_INSTALLATION_CANCELD)"
-!insertmacro LANG_STRING TEXT_MSGBOX_ERROR_SVN_NOMP "${PRODUCT_NAME} ${MIN_INSTALLED_MP_VERSION_TEXT} is not installed. It is required to install this SVN-Snapshot. Please install it first.$\r$\nDo you want to open the download page in your browser now?"
-!insertmacro LANG_STRING TEXT_MSGBOX_ERROR_SVN_WRONG_VERSION "${PRODUCT_NAME} ${MIN_INSTALLED_MP_VERSION_TEXT} is not installed. It is required to install this SVN-Snapshot. Please install it first.$\r$\nDo you want to open the download page in your browser now?"
+!insertmacro LANG_STRING TEXT_MSGBOX_ERROR_SVN_NOMP "${PRODUCT_NAME} ${MIN_INSTALLED_MP_VERSION_TEXT} is not installed. It is required to install this Snapshot-Build. Please install it first.$\r$\nDo you want to open the download page in your browser now?"
+!insertmacro LANG_STRING TEXT_MSGBOX_ERROR_SVN_WRONG_VERSION "${PRODUCT_NAME} ${MIN_INSTALLED_MP_VERSION_TEXT} is not installed. It is required to install this Snapshot-Build. Please install it first.$\r$\nDo you want to open the download page in your browser now?"
!insertmacro LANG_STRING UPDATE_ERROR_WRONGEXE "updating ${PRODUCT_NAME} is only allowed by starting MediaPortalUpdater!"
!insertmacro LANG_STRING UPDATE_ERROR_UNKNOWN "strange / unknown error, please use full installer"
!insertmacro LANG_STRING UPDATE_ERROR_NOTHING_INSTALLED "Nothing to do, nothing installed, please use the full installer"
-!insertmacro LANG_STRING UPDATE_ERROR_VERSION_MP "wrong version of MediaPortal is installed or svn, please use the full installer"
-!insertmacro LANG_STRING UPDATE_ERROR_VERSION_TVSERVER "wrong version or TVServer or Client plugin is installed or svn, please use the full installer"
+!insertmacro LANG_STRING UPDATE_ERROR_VERSION_MP "wrong version of MediaPortal is installed or snapshot-build, please use the full installer"
+!insertmacro LANG_STRING UPDATE_ERROR_VERSION_TVSERVER "wrong version or TVServer or Client plugin is installed or snapshot-build, please use the full installer"
View
6 Tools/Script & Batch tools/DeployVersionGIT/Update_AssemblyInfoCopyright.bat
@@ -1,4 +1,4 @@
-.\DeployVersionSVN\bin\Release\DeployVersionGIT.exe /UpdateCopyright="2005-2010 Team MediaPortal" /svn=..\..\..\mediaportal > update.log
-.\DeployVersionSVN\bin\Release\DeployVersionGIT.exe /UpdateCopyright="2005-2010 Team MediaPortal" /svn=..\..\..\TvEngine3\TVLibrary >> update.log
-.\DeployVersionSVN\bin\Release\DeployVersionGIT.exe /UpdateCopyright="2005-2010 Team MediaPortal" /svn=..\..\..\Common-MP-TVE3 >> update.log
+.\DeployVersionSVN\bin\Release\DeployVersionGIT.exe /UpdateCopyright="2005-2010 Team MediaPortal" /git=..\..\..\mediaportal > update.log
+.\DeployVersionSVN\bin\Release\DeployVersionGIT.exe /UpdateCopyright="2005-2010 Team MediaPortal" /git=..\..\..\TvEngine3\TVLibrary >> update.log
+.\DeployVersionSVN\bin\Release\DeployVersionGIT.exe /UpdateCopyright="2005-2010 Team MediaPortal" /git=..\..\..\Common-MP-TVE3 >> update.log
View
2 TvEngine3/TVLibrary/SetupTv/Sections/Project.designer.cs
@@ -242,7 +242,7 @@ private void InitializeComponent()
this.labelVersion3.Name = "labelVersion3";
this.labelVersion3.Size = new System.Drawing.Size(115, 13);
this.labelVersion3.TabIndex = 2;
- this.labelVersion3.Text = "(SVN for testing only!!!)";
+ this.labelVersion3.Text = "(Snapshot-Build for testing only!!!)";
//
// labelVersion2
//
View
2 mediaportal/Configuration/Sections/Project.designer.cs
@@ -242,7 +242,7 @@ private void InitializeComponent()
this.labelVersion3.Name = "labelVersion3";
this.labelVersion3.Size = new System.Drawing.Size(125, 13);
this.labelVersion3.TabIndex = 2;
- this.labelVersion3.Text = "(SVN is for testing only!!!)";
+ this.labelVersion3.Text = "(Snapshot-Build is for testing only!!!)";
//
// labelVersion2
//

0 comments on commit f3babe9

Please sign in to comment.