Prepare for hack v3.0. Fix for issue #11 (hopefully)

LICENSE-Hack.txt

@@ -1,49 +1,30 @@
-## License
+The work in the Hack project is Copyright 2017 Source Foundry Authors and licensed under the MIT License
 
-Hack Copyright 2015, Christopher Simpkins with Reserved Font Name "Hack".
+The work in the DejaVu project was committed to the public domain.
 
 Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera"
 
-DejaVu modifications of the original Bitstream Vera Sans Mono typeface have been committed to the public domain.
+### MIT License
 
+Copyright (c) 2017 Source Foundry Authors
 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This Font Software is licensed under the Hack Open Font License v2.0 and the Bitstream Vera License.
-
-These licenses are copied below.
-
-
-### Hack Open Font License v2.0
-
-(Version 1.0 - 06 September 2015)
-
-(Version 2.0 - 27 September 2015)
-
-Copyright 2015 by Christopher Simpkins. All Rights Reserved.
-
-DEFINITIONS
-
-"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
-
-PERMISSION AND CONDITIONS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated source code, documentation, and binary files (the "Font Software"), to reproduce and distribute the modifications to the Bitstream Vera Font Software, including without limitation the rights to use, study, copy, merge, embed, modify, redistribute, and/or sell modified or unmodified copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
-
-(1) The above copyright notice and this permission notice shall be included in all modified and unmodified copies of the Font Software typefaces. These notices can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
-
-(2) The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing the word "Hack".
-
-(3) Neither the Font Software nor any of its individual components, in original or modified versions, may be sold by itself.
-
-TERMINATION
-
-This license becomes null and void if any of the above conditions are not met.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the names of Christopher Simpkins and the Author(s) of the Font Software shall not be used to promote, endorse or advertise any modified version, except to acknowledge the contribution(s) of Christopher Simpkins and the Author(s) or with their explicit written permission.  For further information, contact: chris at sourcefoundry dot org.
-
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 ### BITSTREAM VERA LICENSE
 

src/Data.ini

@@ -10,12 +10,12 @@ UniqueID=HackWindowsInstaller
 
 [Version]
 ;Version of the Setup (*NOT* for the Font release).
-Version=1.3.0
+Version=1.4.0
 ;This value can be overwritten by an CI tool during build like this (param EXTERNAL_VERSION):
 ;iscc.exe /DEXTERNAL_VERSION=%APPVEYOR_BUILD_VERSION% src/YourScriptFile.iss
 
 ;Version of FONT release 
-FontVersion=2.020
+FontVersion=3.000
 ;This value can be overwritten by an CI tool during build like this (param EXTERNAL_FONT_VERSION):
 ;iscc.exe /DEXTERNAL_FONT_VERSION=%MY_FONT_BUILD_VERSION% src/YourScriptFile.iss
 
@@ -69,7 +69,7 @@ LicenseFile=license*.*
 ;This section defines which fonts should be installed.
 [InstallFonts]
 ;In which sub folder are the font files located (as seen from the base path).
-SourceFolder=fonts\Hack_v2_020
+SourceFolder=fonts\Hack_v3_000
 
 ;How many fonts are in this section we should install.
 ;This must be number of the last File.X and Name.X entry

src/HackWindowsInstaller.iss

@@ -256,7 +256,7 @@
 
 //--------------------------------------------------------
 //Version of this installer script. Please do not change.
-#define public ScriptVersion '2.01'
+#define public ScriptVersion '2.02'
 //--------------------------------------------------------
 
 
@@ -990,11 +990,21 @@ begin
          FontCacheService_Stopped:=false;
       end;
 
-      customProgressPage.SetText('Starting service {#FontCache30Service}...','');
-      if FontCache30Service_Stopped=true then begin
-         StartNTService2('{#FontCache30Service}');         
-         FontCache30Service_Stopped:=false;
-      end;
+      //We got several error reports that this steps hangs the installer if certain programs are running:
+      //
+      // "Installer stuck at starting fontcache on windows 10 Version 10.0.15063 Build 15063" 
+      // https://github.com/source-foundry/Hack-windows-installer/issues/11
+      //
+      //At least for the one machine I was able to reproduce this, starting the .NET Fontache caused the installer to hang.
+      //Not starting the service after the font install had NO negative impact on the program that seemed to cause this (MS Word).
+      //Therefore, we will NOT restart this service to avoid issue #11.
+      
+      //customProgressPage.SetText('Starting service {#FontCache30Service}...','');
+      //if FontCache30Service_Stopped=true then begin
+      //   StartNTService2('{#FontCache30Service}');         
+      //   FontCache30Service_Stopped:=false;
+      //end;
+
 
       //Inform windows that fonts have changed (just to be sure we do this always)
       //See https://msdn.microsoft.com/en-us/library/windows/desktop/dd183326%28v=vs.85%29.aspx

src/zz_Preprocessor_Result.iss

@@ -47,26 +47,26 @@
 ;  INI position #1
 ;    Hack Bold
 ;    Hack-Bold.ttf
-;    C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Bold.ttf
-;    a7bb6faacd609145b55ed15ca238755544c03af5
+;    C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Bold.ttf
+;    12022be7e047f0ec26517084d5fc6d444a2511ac
 
 ;  INI position #2
 ;    Hack
 ;    Hack-Regular.ttf
-;    C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Regular.ttf
-;    664cfe2a64de1486c0ace8073ceeb6d9281e8b78
+;    C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Regular.ttf
+;    8f7271c506e5fc5b6ad69ec00845f10d0a4ee146
 
 ;  INI position #3
 ;    Hack Bold Italic
 ;    Hack-BoldItalic.ttf
-;    C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-BoldItalic.ttf
-;    c428004a2fe3570450c6d03442052b1a9989c58b
+;    C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-BoldItalic.ttf
+;    e41d5b385511295d1f771f2c647e9151dbf72012
 
 ;  INI position #4
 ;    Hack Italic
 ;    Hack-Italic.ttf
-;    C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Italic.ttf
-;    efdae4b94858b98eab6dcf2cb8e3cc3d28263cc2
+;    C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Italic.ttf
+;    593a16309b9fe89ce600ef688cb53d5747054ab3
 
 
 
@@ -111,10 +111,10 @@
 ;Because the sub expects a string for each item, an error from ISPP about "Actual datatype not declared type" 
 ;when compiling the setup indicates that total_fonts is set to a wrong value
 
-; C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Bold.ttf\Hack-Bold.ttf - "Hack Bold" - a7bb6faacd609145b55ed15ca238755544c03af5
-; C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Regular.ttf\Hack-Regular.ttf - "Hack" - 664cfe2a64de1486c0ace8073ceeb6d9281e8b78
-; C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-BoldItalic.ttf\Hack-BoldItalic.ttf - "Hack Bold Italic" - c428004a2fe3570450c6d03442052b1a9989c58b
-; C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Italic.ttf\Hack-Italic.ttf - "Hack Italic" - efdae4b94858b98eab6dcf2cb8e3cc3d28263cc2
+; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Bold.ttf\Hack-Bold.ttf - "Hack Bold" - 12022be7e047f0ec26517084d5fc6d444a2511ac
+; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Regular.ttf\Hack-Regular.ttf - "Hack" - 8f7271c506e5fc5b6ad69ec00845f10d0a4ee146
+; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-BoldItalic.ttf\Hack-BoldItalic.ttf - "Hack Bold Italic" - e41d5b385511295d1f771f2c647e9151dbf72012
+; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Italic.ttf\Hack-Italic.ttf - "Hack Italic" - 593a16309b9fe89ce600ef688cb53d5747054ab3
 
 ;---END---
 
@@ -136,8 +136,8 @@ SetupMutex=HackWindowsInstaller_Mutex
 
 AppName=Hack Windows Installer
 
-AppVersion=1.3.0
-VersionInfoVersion=1.3.0
+AppVersion=1.4.0
+VersionInfoVersion=1.4.0
 
 AppPublisher=Michael Hex / Source Foundry
 AppCopyright=Copyright © 2016 Michael Hex / Source Foundry
@@ -149,7 +149,7 @@ AppSupportURL=http://sourcefoundry.org/hack/
 ;Should also be displayed there, but I was unable to verify this
 AppContact=Michael Hex / Source Foundry
 ;Displayed as "Comments" 
-AppComments=Hack fonts v2.020
+AppComments=Hack fonts v3.000
 ;Displayed as "Update information:" -NOT USED RIGHT NOW-
 ;AppUpdatesURL=http://appupdates.com
 ;---------------------------------------------------
@@ -208,7 +208,7 @@ AllowCancelDuringInstall=False
 SetupAppTitle=Hack Windows Installer
 
 ;SetupWindowsTitle is displayed in the setup window itself so we better include the version
-SetupWindowTitle=Hack Windows Installer 1.3.0
+SetupWindowTitle=Hack Windows Installer 1.4.0
 
 ;Messages for the "Read to install" wizard page
   ;NOT USED - "Ready To Install" - below title bar
@@ -218,7 +218,7 @@ SetupWindowTitle=Hack Windows Installer 1.3.0
 ReadyLabel1=
 
 ;ReadyLabel2b: "Click Install to continue with the installation" 
-ReadyLabel2b=Setup is now ready to install the Hack fonts v2.020 on your system.
+ReadyLabel2b=Setup is now ready to install the Hack fonts v3.000 on your system.
 
 
 [Icons]
@@ -238,10 +238,10 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
 
 ;------------------------
 ;Install font files and register them
-  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Bold.ttf"; FontInstall: "Hack Bold"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
-  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Regular.ttf"; FontInstall: "Hack"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
-  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-BoldItalic.ttf"; FontInstall: "Hack Bold Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
-  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v2_020\Hack-Italic.ttf"; FontInstall: "Hack Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
+  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Bold.ttf"; FontInstall: "Hack Bold"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
+  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Regular.ttf"; FontInstall: "Hack"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
+  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-BoldItalic.ttf"; FontInstall: "Hack Bold Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
+  Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_000\Hack-Italic.ttf"; FontInstall: "Hack Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace; 
 ;------------------------
 
 
@@ -287,7 +287,7 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
 
 [INI]
 ;Create an ini to make detection for enterprise deployment tools easy
-Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.3.0"
+Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.4.0"
 Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "Hack Windows Installer"
 
 
@@ -519,10 +519,10 @@ procedure FillFontDataArray();
 begin
 
 
-  AddFontData('Hack-Bold.ttf', 'Hack Bold', 'a7bb6faacd609145b55ed15ca238755544c03af5');
-  AddFontData('Hack-Regular.ttf', 'Hack', '664cfe2a64de1486c0ace8073ceeb6d9281e8b78');
-  AddFontData('Hack-BoldItalic.ttf', 'Hack Bold Italic', 'c428004a2fe3570450c6d03442052b1a9989c58b');
-  AddFontData('Hack-Italic.ttf', 'Hack Italic', 'efdae4b94858b98eab6dcf2cb8e3cc3d28263cc2');
+  AddFontData('Hack-Bold.ttf', 'Hack Bold', '12022be7e047f0ec26517084d5fc6d444a2511ac');
+  AddFontData('Hack-Regular.ttf', 'Hack', '8f7271c506e5fc5b6ad69ec00845f10d0a4ee146');
+  AddFontData('Hack-BoldItalic.ttf', 'Hack Bold Italic', 'e41d5b385511295d1f771f2c647e9151dbf72012');
+  AddFontData('Hack-Italic.ttf', 'Hack Italic', '593a16309b9fe89ce600ef688cb53d5747054ab3');
 
 end;
 
@@ -670,9 +670,9 @@ begin
 
   LogAsImportant('--------------------------------');
   LogAsImportant('Font name.....: Hack fonts');
-  LogAsImportant('Script version: 2.01');
-  LogAsImportant('Setup version.: 1.3.0');
-  LogAsImportant('Font version..: 2.020');
+  LogAsImportant('Script version: 2.02');
+  LogAsImportant('Setup version.: 1.4.0');
+  LogAsImportant('Font version..: 3.000');
   LogAsImportant('Local time....: ' + GetDateTimeString('yyyy-dd-mm hh:nn', '-', ':'));
   LogAsImportant('Fonts folder..: ' + ExpandConstant('{fonts}'));
   LogAsImportant('Dest folder...: ' + ExpandConstant('{app}'));
@@ -753,11 +753,8 @@ begin
          FontCacheService_Stopped:=false;
       end;
 
-      customProgressPage.SetText('Starting service FontCache3.0.0.0...','');
-      if FontCache30Service_Stopped=true then begin
-         StartNTService2('FontCache3.0.0.0');         
-         FontCache30Service_Stopped:=false;
-      end;
+      
+
 
       SendBroadcastMessage(29, 0, 0);