Merge pull request #78 from ansani/1-remove-support-for-tortoisesvn-a…

…nd-link-the-new-repo

Remove support for tortoisesvn and link the new repo

.github/workflows/msbuild.yml

@@ -22,6 +22,13 @@ jobs:
     steps:
     - name: Checkout GIT sources
       uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install GitVersion
+      uses: gittools/actions/gitversion/setup@v0.9.7
+      with:
+        versionSpec: '5.x'
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
@@ -34,11 +41,15 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
+    - name: Determine Version
+      id:   gitversion
+      uses: gittools/actions/gitversion/execute@v0.9.7
+
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild ${{env.SOLUTION_FILE_PATH}} /nologo /v:m /t:Rebuild /p:ForceImportBeforeCppTargets=${{env.RELEASEBUILD_FILE_PATH}} /p:Configuration=${{ matrix.type }} /p:Platform=${{ matrix.platform }} /fl /flp:Summary
+      run: msbuild ${{env.SOLUTION_FILE_PATH}} /nologo /v:m /t:Rebuild /p:ForceImportBeforeCppTargets=${{env.RELEASEBUILD_FILE_PATH}} /p:Configuration=${{ matrix.type }} /p:Platform=${{ matrix.platform }} /p:DefineConstants=BUILDFROMMSBUILD /p:RevisionSHA=${{ steps.gitversion.outputs.ShortSha }} /p:RevisionDate=${{ steps.gitversion.outputs.commitDate }} /fl /flp:Summary
 
     - name: Archive Shareaza Release
       uses: actions/upload-artifact@v3

.gitignore

@@ -253,8 +253,6 @@ pip-log.txt
 /plugins/GFLImageServices/GFLImageServices.h
 /plugins/DocumentReader/DocumentReader.h
 /plugins/7ZipBuilder/7ZipBuilder.h
-/shareaza/revision.h
-
 /setup/builds
 
 /shareaza/ShareazaOM.h
@@ -294,8 +292,6 @@ pip-log.txt
 /plugins/7ZipBuilder/Shareaza.h
 /plugins/7ZipBuilder/7ZipBuilder.h
 /shareaza/ShareazaOM.h
-
-/shareaza/revision.h
 /plugins/7ZipBuilder/7ZipBuilder.h
 /plugins/7ZipBuilder/Shareaza.h
 /plugins/DocumentReader/DocumentReader.h

shareaza/Shareaza.cpp

@@ -1082,7 +1082,7 @@ void CShareazaApp::InitResources()
 #ifdef LAN_MODE
 		_T(" LAN")
 #endif
-		_T(" (r") _T(__REVISION__) _T("i ") + m_sBuildDate + _T(")");
+		_T(" (commit ") STRINGIZE(__REVISION__) _T(" of ") STRINGIZE(__REVISION_DATE__) _T(")");
 
 	BT_SetAppVersion( m_sVersionLong );
 

shareaza/Shareaza_143.vcxproj

@@ -113,8 +113,10 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Message>Pre-Building...</Message>
-      <Command>cscript.exe //E:jscript //nologo revision.js</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -156,8 +158,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Message>Pre-Building...</Message>
-      <Command>cscript.exe //E:jscript //nologo revision.js</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -208,8 +212,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Message>Pre-Building...</Message>
-      <Command>cscript.exe //E:jscript //nologo revision.js</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -264,8 +270,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Message>Pre-Building...</Message>
-      <Command>cscript.exe //E:jscript //nologo revision.js</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -317,6 +325,16 @@
       <EnableDpiAwareness>false</EnableDpiAwareness>
     </Manifest>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(RevisionSHA)' != ''">
+    <ClCompile>
+        <AdditionalOptions>/DRevisionSHA=$(RevisionSHA) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(RevisionDate)' != ''">
+    <ClCompile>
+        <AdditionalOptions>/DRevisionDate=$(RevisionDate) %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AlbumFolder.cpp" />
     <ClCompile Include="AntiVirus.cpp" />
@@ -1334,7 +1352,6 @@
     <None Include="Res\Wizard.png" />
     <None Include="Res\WizardDot.ico" />
     <None Include="Res\World.ico" />
-    <None Include="revision.js" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\bzlib\bzlib_143.vcxproj">

shareaza/Shareaza_143.vcxproj.filters

@@ -2699,7 +2699,6 @@
     <None Include="Res\World.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="revision.js" />
     <None Include="Res\in.ico">
       <Filter>Resource Files</Filter>
     </None>

shareaza/revision.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#define STRINGIZE2(x) #x 
+#define STRINGIZE(x) STRINGIZE2(x)
+
+#ifndef RevisionSHA
+#define __REVISION__		"BUILT MANUALLY"
+#else
+#define __REVISION__		RevisionSHA
+#endif
+
+#ifndef RevisionDate
+#define __REVISION_DATE__	"NOT AVAILABLE"
+#else
+#define __REVISION_DATE__	RevisionDate
+#endif