Adjust build after switching to Git.

stefankueng · stefankueng · commit bfbf30e898f1 · 2018-03-29T15:14:53.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+/default.build.user
+/obj
+/bin
+/.vs
+/packages
+/src/grepWin.vcxproj.user
+/src/version.h
+/version.build
+/signinfo.txt
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sktoolslib"]
+	path = sktoolslib
+	url = https://github.com/stefankueng/sktoolslib.git
diff --git a/sktoolslib b/sktoolslib
@@ -0,0 +1 @@
+Subproject commit 34e5ec0bfa3692431d8c8fe86d9215defa717fd1
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
@@ -13,7 +13,7 @@
 
     <Package Id="*" Keywords="Installer"
           Description="Stefans grepWin"
-          Comments="http://stefanstools.sourceforge.net" Manufacturer="Stefans Tools"
+          Comments="http://tools.stefankueng.com" Manufacturer="Stefans Tools"
           InstallerVersion="200" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Upgrade Id="C8EC878C-5B8A-4208-9670-64313B180089" >
diff --git a/src/Setup/Setup64.wxs b/src/Setup/Setup64.wxs
@@ -13,7 +13,7 @@
 
     <Package Id="*" Keywords="Installer"
           Description="Stefans grepWin x64"
-          Comments="http://stefanstools.sourceforge.net" Manufacturer="Stefans Tools"
+          Comments="http://tools.stefankueng.com" Manufacturer="Stefans Tools"
           InstallerVersion="200" Platform="x64" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
     <Upgrade Id="C73ED533-953E-47E5-9A42-A48292BB7C6C" >
diff --git a/src/Setup/Setup64_user.wxs b/src/Setup/Setup64_user.wxs
@@ -13,7 +13,7 @@
 
     <Package Id="*" Keywords="Installer"
           Description="Stefans grepWin x64"
-          Comments="http://stefanstools.sourceforge.net" Manufacturer="Stefans Tools"
+          Comments="http://tools.stefankueng.com" Manufacturer="Stefans Tools"
           InstallerVersion="200" Platform="x64" Languages="1033" Compressed="yes" SummaryCodepage="1252"
           InstallScope="perUser" InstallPrivileges="limited" />
 
diff --git a/src/Setup/Setup_user.wxs b/src/Setup/Setup_user.wxs
@@ -13,7 +13,7 @@
 
     <Package Id="*" Keywords="Installer"
           Description="Stefans grepWin"
-          Comments="http://stefanstools.sourceforge.net" Manufacturer="Stefans Tools"
+          Comments="http://tools.stefankueng.com" Manufacturer="Stefans Tools"
           InstallerVersion="200" Languages="1033" Compressed="yes" SummaryCodepage="1252"
           InstallScope="perUser" InstallPrivileges="limited" />
 
diff --git a/src/grepWin.vcxproj b/src/grepWin.vcxproj
diff --git a/src/grepWin.vcxproj.filters b/src/grepWin.vcxproj.filters
@@ -289,6 +289,12 @@
     <None Include="Setup\Setup64_user.wxs">
       <Filter>Scripts</Filter>
     </None>
+    <None Include="Setup\VersionNumberInclude.in.wxi">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="version.in">
+      <Filter>Header Files</Filter>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/version.build.in b/version.build.in
@@ -5,7 +5,7 @@
             <variable name="MajorVersion" value="1" />
             <variable name="MinorVersion" value="7" />
             <variable name="MicroVersion" value="1" />
-            <variable name="WCREV" value="$WCREV$" />
+            <variable name="WCREV" value="$WCLOGCOUNT$" />
             <variable name="WCDATE" value="$WCDATE$" />
         </setenv>
     </target>
diff --git a/versioninfo.build b/versioninfo.build
@@ -3,7 +3,7 @@
 
     <target name="versioninfo">
 
-        <exec program="SubWCRev.exe">
+        <exec program="GitWCRev.exe">
             <arg value="." />
             <arg value="version.build.in" />
             <arg value="version.build" />

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "sktoolslib"]`
	`2`	`+ path = sktoolslib`
	`3`	`+ url = https://github.com/stefankueng/sktoolslib.git`