From 124ab91e846e9d05eae18b95bd4eadfb569b3d21 Mon Sep 17 00:00:00 2001
From: Derick Payne <rizonetech@gmail.com>
Date: Fri, 3 Jun 2016 13:13:46 +0200
Subject: [PATCH] Build Environment Cleanup

Build Environment Cleanup
---
 .gitignore                          | 11 ++++++++++-
 Build/make_all.bat                  |  5 +++--
 Build/make_installer.bat            |  2 +-
 Version.ini                         |  2 +-
 minipath/Version.ini                |  2 +-
 minipath/res/MiniPath.exe.manifest  |  2 +-
 minipath/src/VersionEx.h            |  4 ++--
 res/Notepad3.exe.manifest           |  2 +-
 scintilla/Scintilla.vcxproj         | 17 +++++++++--------
 scintilla/Scintilla.vcxproj.filters |  3 ---
 src/Version.h                       |  2 +-
 src/VersionEx.h                     |  6 +++---
 12 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27962ac83..c294b798a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,13 @@ Thumbs.db
 /distrib/Notepad3.*.exe
 /Build/Bin/upx.exe
 distrib/Notepad3-0.2.1.213.exe
-distrib/Notepad3-0.2.2.225.exe
\ No newline at end of file
+distrib/Notepad3-0.2.2.225.exe
+Build/Bin/Password.txt
+Build/Bin/Certum.cer
+Build/Bin/Certum.p12
+Build/sign.bat
+Build/Signing/Certum.cer
+Build/Signing/Certum.p12
+Build/Signing/kSign.exe
+Build/Signing/kSignCMD.exe
+Build/Signing/Password.txt
\ No newline at end of file
diff --git a/Build/make_all.bat b/Build/make_all.bat
index a749e6c70..ef28d8542 100644
--- a/Build/make_all.bat
+++ b/Build/make_all.bat
@@ -21,8 +21,9 @@ CD /D %~dp0
 
 CALL "Build.bat"
 CALL "upx.bat"
-rem CALL "make_zip.bat"
-rem CALL "make_installer.bat"
+CALL "sign.bat"
+CALL "make_zip.bat"
+CALL "make_installer.bat"
 
 :END
 TITLE Finished!
diff --git a/Build/make_installer.bat b/Build/make_installer.bat
index 83fe796a0..74f2dbb44 100644
--- a/Build/make_installer.bat
+++ b/Build/make_installer.bat
@@ -92,7 +92,7 @@ EXIT /B
 TITLE Building %1 installer...
 CALL :SUBMSG "INFO" "Building %1 installer using %InnoSetupPath%\ISCC.exe..."
 
-"%InnoSetupPath%\ISCC.exe" /SMySignTool="cmd /c "%~dp0sign.bat" $f" /Q /O"packages" "..\distrib\notepad3_setup.iss" /D%1
+"%InnoSetupPath%\ISCC.exe" /Q /O "packages" "..\distrib\notepad3_setup.iss" /D%1
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
 
 EXIT /B
diff --git a/Version.ini b/Version.ini
index 0f9c86232..3fc581863 100644
--- a/Version.ini
+++ b/Version.ini
@@ -7,7 +7,7 @@ Language=CPlusPlus
 Major=auto
 Minor=auto
 Maintenance=auto 
-Build=293
+Build=302
 
 [CSharp]
 AssemConfig=Rizonesoft.Voice.Win\Properties\AssemblyInfo.cs.conf
diff --git a/minipath/Version.ini b/minipath/Version.ini
index 90b899f88..ad3271cb3 100644
--- a/minipath/Version.ini
+++ b/minipath/Version.ini
@@ -1,4 +1,4 @@
 [Version]
-Build=62
+Build=72
 VersionHeader=src\VersionEx.h
 ManifestConfig=res\MiniPath.exe.manifest.conf
diff --git a/minipath/res/MiniPath.exe.manifest b/minipath/res/MiniPath.exe.manifest
index 1a60b2588..6dc3337b8 100644
--- a/minipath/res/MiniPath.exe.manifest
+++ b/minipath/res/MiniPath.exe.manifest
@@ -3,7 +3,7 @@
     <assemblyIdentity
         name="MiniPath"
         processorArchitecture="*"
-        version="0.0.6.62"
+        version="0.0.7.72"
         type="win32"
      />
     <description>metapath</description>
diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h
index 07d227aef..e9735086a 100644
--- a/minipath/src/VersionEx.h
+++ b/minipath/src/VersionEx.h
@@ -1,4 +1,4 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 0
-#define VERSION_REV 6
-#define VERSION_BUILD 62
+#define VERSION_REV 7
+#define VERSION_BUILD 72
diff --git a/res/Notepad3.exe.manifest b/res/Notepad3.exe.manifest
index c3fb8ae52..50aaa6582 100644
--- a/res/Notepad3.exe.manifest
+++ b/res/Notepad3.exe.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="0.2.9.293"
+    version="0.3.0.302"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index d50e19866..b7b8474fc 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -23,6 +23,7 @@
     <ProjectGuid>{5877B917-512B-49F5-B514-1B4159E7A9CA}</ProjectGuid>
     <ProjectName>Scintilla</ProjectName>
     <RootNamespace>Scintilla</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -80,35 +81,35 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
index d3973a604..e49186e26 100644
--- a/scintilla/Scintilla.vcxproj.filters
+++ b/scintilla/Scintilla.vcxproj.filters
@@ -395,9 +395,6 @@
     <ClInclude Include="src\XPM.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="win32\HanjaDic.h">
-      <Filter>win32</Filter>
-    </ClInclude>
     <ClInclude Include="win32\PlatWin.h">
       <Filter>win32</Filter>
     </ClInclude>
diff --git a/src/Version.h b/src/Version.h
index 81b1f476c..1b1ede3a1 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -66,7 +66,7 @@
 #elif defined(_MSC_VER)
     #if _MSC_VER == 1900
         #if (_MSC_FULL_VER == 190023506)
-            #define VERSION_COMPILER    L"Microsoft Visual C++ Update 1"
+            #define VERSION_COMPILER    L"Microsoft Visual C++ 2015 Update 1"
         #elif (_MSC_FULL_VER == 190023026)
             #define VERSION_COMPILER    L"Microsoft Visual C++ 2015"
         #elif (_MSC_FULL_VER < 190023026)
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 87ad6fc5b..776ea1ac7 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,4 +1,4 @@
 #define VERSION_MAJOR 0
-#define VERSION_MINOR 2
-#define VERSION_REV 9
-#define VERSION_BUILD 293
+#define VERSION_MINOR 3
+#define VERSION_REV 0
+#define VERSION_BUILD 302