From 6fa94e0d2f2e67a1037ed25e717d3a408ff5ef7a Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon.rozman@amebis.si>
Date: Wed, 12 Mar 2014 13:46:43 +0000
Subject: [PATCH] Poenotil sem verzijo.

Verzijo sem nastavil na 1.0-pre.
---
 .gitattributes      |   1 +
 MSICA.sln           |   5 +++++
 MSICALib/MSICALib.h |  17 -----------------
 MSITSCA/MSITSCA.h   |  19 -------------------
 MSITSCA/MSITSCA.rcx | Bin 5196 -> 5158 bytes
 MSITSCA/stdafx.h    |   4 ++--
 include/version.h   |   9 +++++++++
 7 files changed, 17 insertions(+), 38 deletions(-)
 create mode 100644 include/version.h

diff --git a/.gitattributes b/.gitattributes
index ea80065..9b071ea 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,4 +25,5 @@ include/Debug.props -text svneol=unset#text/xml
 include/Release.props -text svneol=unset#text/xml
 include/Win32.props -text svneol=unset#text/xml
 include/common.props -text svneol=unset#text/xml
+include/version.h -text
 include/x64.props -text svneol=unset#text/xml
diff --git a/MSICA.sln b/MSICA.sln
index 12cbdc1..2cb3a50 100644
--- a/MSICA.sln
+++ b/MSICA.sln
@@ -5,6 +5,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "MSICALib\MSICAL
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSITSCA", "MSITSCA\MSITSCA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F3D5C008-7728-49CA-84F1-12C186FC87F8}"
+	ProjectSection(SolutionItems) = preProject
+		include\version.h = include\version.h
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
diff --git a/MSICALib/MSICALib.h b/MSICALib/MSICALib.h
index fbcb6a4..3d24e30 100644
--- a/MSICALib/MSICALib.h
+++ b/MSICALib/MSICALib.h
@@ -1,21 +1,6 @@
 #ifndef __MSICALib_H__
 #define __MSICALib_H__
 
-////////////////////////////////////////////////////////////////////////////
-// Version
-////////////////////////////////////////////////////////////////////////////
-
-#define MSICALib_VERSION       0x02000000
-
-#define MSICALib_VERSION_MAJ   2
-#define MSICALib_VERSION_MIN   0
-#define MSICALib_VERSION_REV   0
-
-#define MSICALib_VERSION_STR   "2.0"
-
-
-#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
-
 #include <atlbase.h>
 #include <atlcoll.h>
 #include <atlfile.h>
@@ -1424,6 +1409,4 @@ template <class T> inline HRESULT COpList::LoadAndAddTail(ATL::CAtlFile &f)
 
 } // namespace MSICA
 
-
-#endif // RC_INVOKED
 #endif // __MSICALib_H__
diff --git a/MSITSCA/MSITSCA.h b/MSITSCA/MSITSCA.h
index 36a8b79..6f21aaa 100644
--- a/MSITSCA/MSITSCA.h
+++ b/MSITSCA/MSITSCA.h
@@ -1,23 +1,6 @@
 #ifndef __MSITSCA_H__
 #define __MSITSCA_H__
 
-
-////////////////////////////////////////////////////////////////////////////
-// Constants
-////////////////////////////////////////////////////////////////////////////
-
-#define MSITSCA_VERSION        0x02010100
-
-#define MSITSCA_VERSION_MAJ    2
-#define MSITSCA_VERSION_MIN    1
-#define MSITSCA_VERSION_REV    1
-#define MSITSCA_VERSION_BUILD  0
-
-#define MSITSCA_VERSION_STR    "2.1.1"
-#define MSITSCA_BUILD_YEAR_STR "2014"
-
-#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
-
 #include <msi.h>
 
 
@@ -48,6 +31,4 @@ extern "C" {
 }
 #endif
 
-#endif // !defined(RC_INVOKED) && !defined(MIDL_PASS)
-
 #endif // __MSITSCA_H__
diff --git a/MSITSCA/MSITSCA.rcx b/MSITSCA/MSITSCA.rcx
index 7e577fc506736f9a63ff9022f9c1184a7f4cde6d..77164c3fa614d4a7487ad347ec97a29a756e2d83 100644
GIT binary patch
delta 108
zcmX@3u}ot^jIbVq9zzU68AB>V5koOUCPO|$-p0)L%##CHB_=zt@&IWSAQqe4$I3T(
n0jtg=Fc(8=^8!{iR*<^Q54bECC(H1>0Bd@{rLx(Hmx~<$a#<dm

delta 167
zcmZ3caYkc846iRkFoP#U2#|DUaNL;xo|zfQp4`YH$?wSE#h}9gmj{Zeg5?rfA#@{)
z_~ZvHRwSwyn;gf^F?j<U*XARvFId2uAM#jF4&dh4{Emx<5iIbN`z46p{E)|$9RP0K
BE6e}@

diff --git a/MSITSCA/stdafx.h b/MSITSCA/stdafx.h
index e8c5e57..ac1b71c 100644
--- a/MSITSCA/stdafx.h
+++ b/MSITSCA/stdafx.h
@@ -32,6 +32,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "MSITSCA.h"
-
 #include "..\MSICALib\MSICALib.h"
+
+#include "MSITSCA.h"
diff --git a/include/version.h b/include/version.h
new file mode 100644
index 0000000..7e4d8df
--- /dev/null
+++ b/include/version.h
@@ -0,0 +1,9 @@
+#define MSICA_VERSION        0x00ff0000
+
+#define MSICA_VERSION_MAJ    0
+#define MSICA_VERSION_MIN    255
+#define MSICA_VERSION_REV    0
+#define MSICA_VERSION_BUILD  0
+
+#define MSICA_VERSION_STR    "1.0-pre"
+#define MSICA_BUILD_YEAR_STR "2014"