Add version number to executable

rasa · Apr 13, 2015 · 955016d · 955016d
1 parent f13ad66
commit 955016d
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.2 (07-Apr-2015)
+
+  * Add version number to executable
+  * Add .rc and .ico files to build
+
 ## 1.1 (27-Mar-2015)
 
   * Executables signed with StartSSL code signing certificate

diff --git a/time_it.dep b/time_it.dep
@@ -1,15 +1,13 @@
 # Microsoft Developer Studio Generated Dependency File, included by time_it.mak
 
 .\time_it.cpp : \
-	{$(INCLUDE)}"basetsd.h"\
-	{$(INCLUDE)}"guiddef.h"\
-	{$(INCLUDE)}"propidl.h"\
-	{$(INCLUDE)}"reason.h"\
-	{$(INCLUDE)}"specstrings.h"\
-	{$(INCLUDE)}"stralign.h"\
-	{$(INCLUDE)}"tvout.h"\
-	{$(INCLUDE)}"winefs.h"\
 	{$(INCLUDE)}"getopt.h"\
+	".\version.h"\
 	{$(INCLUDE)}"ver_defaults.h"\
+
+
+.\time_it.rc : \
+	".\time_it.ico"\
 	".\version.h"\
+	{$(INCLUDE)}"ver_defaults.h"\
 
diff --git a/time_it.dsp b/time_it.dsp
diff --git a/time_it.mak b/time_it.mak
@@ -25,9 +25,6 @@ NULL=
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "time_it - Win32 Release"
 
 OUTDIR=.\Release
@@ -41,21 +38,57 @@ ALL : "$(OUTDIR)\time_it.exe"
 
 CLEAN :
 	-@erase "$(INTDIR)\time_it.obj"
+	-@erase "$(INTDIR)\time_it.res"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(OUTDIR)\time_it.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\shared" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\time_it.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\time_it.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\time_it.bsc" 
 BSC32_SBRS= \
 
 LINK32=link.exe
 LINK32_FLAGS=shared.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\time_it.pdb" /machine:I386 /out:"$(OUTDIR)\time_it.exe" 
 LINK32_OBJS= \
-	"$(INTDIR)\time_it.obj"
+	"$(INTDIR)\time_it.obj" \
+	"$(INTDIR)\time_it.res"
 
 "$(OUTDIR)\time_it.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -75,6 +108,7 @@ ALL : "$(OUTDIR)\time_it.exe" "$(OUTDIR)\time_it.bsc"
 
 CLEAN :
 	-@erase "$(INTDIR)\time_it.obj"
+	-@erase "$(INTDIR)\time_it.res"
 	-@erase "$(INTDIR)\time_it.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
@@ -86,28 +120,8 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\shared" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\time_it.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\time_it.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\time_it.sbr"
-
-"$(OUTDIR)\time_it.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=sharedd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\time_it.pdb" /debug /machine:I386 /out:"$(OUTDIR)\time_it.exe" /pdbtype:sept 
-LINK32_OBJS= \
-	"$(INTDIR)\time_it.obj"
-
-"$(OUTDIR)\time_it.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -139,6 +153,31 @@ LINK32_OBJS= \
    $(CPP_PROJ) $< 
 <<
 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\time_it.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\time_it.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\time_it.sbr"
+
+"$(OUTDIR)\time_it.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=sharedd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\time_it.pdb" /debug /machine:I386 /out:"$(OUTDIR)\time_it.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\time_it.obj" \
+	"$(INTDIR)\time_it.res"
+
+"$(OUTDIR)\time_it.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("time_it.dep")
@@ -166,6 +205,12 @@ SOURCE=.\time_it.cpp
 
 !ENDIF 
 
+SOURCE=.\time_it.rc
+
+"$(INTDIR)\time_it.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
 
 !ENDIF 
 
diff --git a/time_it.vcproj b/time_it.vcproj
@@ -3,8 +3,8 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="time_it"
-	ProjectGUID="{29DB73D3-D4F1-4864-A540-5171782822C8}"
-	TargetFrameworkVersion="131072"
+	ProjectGUID="{36657A9B-3F42-4FC0-AA37-BD33A4D976D0}"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -240,6 +240,30 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath="time_it.ico"
+				>
+			</File>
+			<File
+				RelativePath="time_it.rc"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

diff --git a/time_it.vcxproj b/time_it.vcxproj
@@ -145,6 +145,9 @@
   <ItemGroup>
     <ClInclude Include="version.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="time_it.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/time_it.vcxproj.filters b/time_it.vcxproj.filters
@@ -24,4 +24,9 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="time_it.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
diff --git a/version.h b/version.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2002-2015 Ross Smith II. See Mit LICENSE in /LICENSE
+// Copyright (c) 2002-2015 Ross Smith II. MIT licensed.
 
 #define VER_INTERNAL_NAME 		"time_it"
 #define	VER_FILE_DESCRIPTION	"Time disk I/O"
 #define VER_MAJOR				1
-#define VER_MINOR				1
-#define VER_STRING2				"1.1"
+#define VER_MINOR				2
+#define VER_STRING2				"1.2"
 
 #include "ver_defaults.h"