- inc version

- fix: Installer does not wait for uninstaller to finish #146

launch4j.xml

@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>.\release\yass-2.4.3.jar</jar>
+  <jar>.\release\yass-2.5.0.jar</jar>
   <outfile>.\release\yass.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
@@ -28,12 +28,12 @@
     <timeoutErr>true</timeoutErr>
   </splash>
   <versionInfo>
-    <fileVersion>2.4.3.0</fileVersion>
-    <txtFileVersion>Yass 2.4.3.0</txtFileVersion>
+    <fileVersion>2.5.0.0</fileVersion>
+    <txtFileVersion>Yass 2.5.0.0</txtFileVersion>
     <fileDescription>Yass - Karaoke Editor</fileDescription>
-    <copyright>(C)2022 Saruta</copyright>
-    <productVersion>2.4.3.0</productVersion>
-    <txtProductVersion>2.4.3.0</txtProductVersion>
+    <copyright>(C)2024 Saruta</copyright>
+    <productVersion>2.5.0.0</productVersion>
+    <txtProductVersion>2.5.0.0</txtProductVersion>
     <productName>Yass</productName>
     <companyName>yass-along.com</companyName>
     <internalName>yass</internalName>

nsis-installer.nsi

@@ -1,6 +1,6 @@
 Name "Yass"
 
-OutFile ".\release\yass-installer-2.4.3.exe"
+OutFile ".\release\yass-installer-2.5.0.exe"
 
 Unicode true
 SetCompressor lzma
@@ -120,8 +120,19 @@ uninst:
   RMDir /r "$SMPROGRAMS\Yass Along 1.8.0"
   RMDir /r "$SMPROGRAMS\Yass Along 1.7.1"
 
+  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+    $(Msg_RemoveSettings) \
+    IDNO bye IDYES yes
+yes:
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+    $(Msg_RemoveSettingsReally) \
+    IDOK yes2 IDCANCEL bye
+yes2:
+  RMDir /r "$PROFILE\.yass"
+bye:
+
   ClearErrors
-  ExecWait $R0
+  ExecWait "$R0 /S _?=$INSTDIR"
 done:
 FunctionEnd
 ##################
@@ -263,16 +274,4 @@ Section "Uninstall"
   Delete "$INSTDIR\yass.exe"
   Delete "$INSTDIR\uninstall.exe"
   RMDir  "$INSTDIR"
-
-  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-    $(Msg_RemoveSettings) \
-    IDNO bye IDYES yes
-yes:
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-    $(Msg_RemoveSettingsReally) \
-    IDOK yes2 IDCANCEL bye
-yes2:
-  RMDir /r "$PROFILE\.yass"
-bye:
-
 sectionEnd

src/yass/I18.java

@@ -262,7 +262,7 @@ public static String getCopyright(String version, String date) {
         sb.append("[email protected]<br>");
         sb.append("<a href=\"http://yass-along.com\">http://yass-along.com</a><br>");
         sb.append("<br>");
-        sb.append("Copyright (C) 2020 Saruta<br>");
+        sb.append("Copyright (C) 2009-2024 Saruta<br>");
         sb.append("This program is free software: you can redistribute it and/or modify<br>");
         sb.append("it under the terms of the GNU General Public License as published by<br>");
         sb.append("the Free Software Foundation, either version 3 of the License, or<br>");

src/yass/YassActions.java

@@ -41,8 +41,8 @@
 public class YassActions implements DropTargetListener {
 
     private final YassSheet sheet;
-    public final static String VERSION = "2.4.3";
-    public final static String DATE = "03/2023";
+    public final static String VERSION = "2.5.0";
+    public final static String DATE = "01/2024";
 
     static int VIEW_LIBRARY = 1;
     static int VIEW_EDIT = 2;