WinGui: Disable the subversion build code. Will update to handle git later.

5 files changed, 10 insertions, 10 deletions

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
index a1df7c5d8..4ae8fd1e6 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl
@@ -8,8 +8,8 @@
 

 ; HM NIS Edit Wizard helper defines

 !define PRODUCT_NAME "HandBrake"

-!define PRODUCT_VERSION "$WCREV$ Nightly"

-!define PRODUCT_VERSION_NUMBER "svn$WCREV$"

+!define PRODUCT_VERSION "Nightly"

+!define PRODUCT_VERSION_NUMBER "0.10.3.Nightly"

 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
index f1b2f8d6e..1459a52cd 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl
@@ -8,8 +8,8 @@
 

 ; HM NIS Edit Wizard helper defines

 !define PRODUCT_NAME "HandBrake"

-!define PRODUCT_VERSION "$WCREV$ Nightly"

-!define PRODUCT_VERSION_NUMBER "svn$WCREV$"

+!define PRODUCT_VERSION "Nightly"

+!define PRODUCT_VERSION_NUMBER "0.10.3.Nightly"

 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"

 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl
index 228a58f1c..9bd03adc2 100644
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl
@@ -60,6 +60,6 @@ using System.Windows;
 //

 // You can specify all the values or you can default the Build and Revision Numbers 

 // by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("0.0.0.$WCREV$")]

+// [assembly: AssemblyVersion("1.0.*")]  $WCREV$

+[assembly: AssemblyVersion("0.0.0.0")]

 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl
index db5403b6f..95774c1bb 100644
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl
@@ -60,6 +60,6 @@ using System.Windows;
 //

 // You can specify all the values or you can default the Build and Revision Numbers 

 // by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("0.1.0.$WCREV$")]

+// [assembly: AssemblyVersion("1.0.*")] $WCREV$

+[assembly: AssemblyVersion("0.1.0.0")]

 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
diff --git a/win/CS/build.xml b/win/CS/build.xml
index a5c71c33f..6d2b793d7 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -46,7 +46,7 @@
     </MSBuild>

   </Target>

 

-  <!-- Pre Build Events. You must do a full checkout as it takes the svn from the main directory.  $(ProjectDir). is not used. -->

+  <!-- Pre Build Events. You must do a full checkout as it takes the svn from the main directory.  $(ProjectDir). is not used. 

   <Target Name="NightlyPreBuild">

     <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />

     <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />

@@ -59,7 +59,7 @@
     <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />

     <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />

     <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />

-  </Target>

+  </Target>-->

 

   <!-- Post Build Events -->

   <Target Name="NightlyPostBuild">