update installer things; prepare to migrate to git

teras · Mar 12, 2016 · 066c5d9 · 066c5d9
1 parent feb62ce
commit 066c5d9
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/.hgignore b/.hgignore
@@ -8,3 +8,4 @@ build/
 dist/
 ^_support/
 nbproject/private/
+codesign.properties
diff --git a/build.xml b/build.xml
@@ -143,6 +143,11 @@
 		<delete dir="/Volumes/Jubler-template/Jubler.app" includeemptydirs="yes"/>
         <exec executable="cp">
             <arg line="-R dist/Jubler.app /Volumes/Jubler-template/Jubler.app"/>
+        </exec>
+        <!-- security find-identity -v -p codesigning -->
+        <loadproperties srcfile="codesign.properties"/>
+        <exec executable="codesign" failonerror="true">
+            <arg line="--force --verify --verbose --sign ${code.sign.key} /Volumes/Jubler-template/Jubler.app"/>
         </exec>
 		<exec executable="hdiutil" failonerror="true">
 			<arg line="detach -force /Volumes/Jubler-template"/>

diff --git a/resources/installers/macosx/license_dmg b/resources/installers/macosx/license_dmg
@@ -1009,24 +1009,24 @@ data 'TEXT' (5000, "English") {
 };
 
 data 'styl' (5000, "English") {
-    $"000F 0000 0000 0016 001A 0016 0071 0012"    /* .............q.. */
+    $"000F 0000 0000 0016 001A 0016 00CB 0012"    /* ................ */
     $"0000 0000 0000 0000 0022 0016 001A 0016"    /* ........."...... */
-    $"0171 0012 0000 0000 0000 0000 002D 0016"    /* .q...........-.. */
-    $"001A 0016 0071 0012 0000 0000 0000 0000"    /* .....q.......... */
-    $"0047 000E 0011 0015 0071 000C 0000 0000"    /* .G.......q...... */
-    $"0000 0000 0049 0011 0014 0015 0071 000E"    /* .....I.......q.. */
+    $"01CB 0012 0000 0000 0000 0000 002D 0016"    /* .............-.. */
+    $"001A 0016 00CB 0012 0000 0000 0000 0000"    /* ................ */
+    $"0047 000E 0011 0015 00CB 000C 0000 0000"    /* .G.............. */
+    $"0000 0000 0049 0011 0014 0015 00CB 000E"    /* .....I.......... */
     $"0000 0000 0000 0000 0070 0011 0014 0015"    /* .........p...... */
-    $"0171 000E D9D9 0B0B 0000 0000 0075 0011"    /* .q...........u.. */
-    $"0014 0015 0171 000E 0000 0000 0000 0000"    /* .....q.......... */
-    $"0076 0011 0014 0015 0071 000E 0000 0000"    /* .v.......q...... */
-    $"0000 0000 0077 0011 0014 0015 0171 000E"    /* .....w.......q.. */
+    $"01CB 000E D9D9 0B0B 0000 0000 0075 0011"    /* .............u.. */
+    $"0014 0015 01CB 000E 0000 0000 0000 0000"    /* ................ */
+    $"0076 0011 0014 0015 00CB 000E 0000 0000"    /* .v.............. */
+    $"0000 0000 0077 0011 0014 0015 01CB 000E"    /* .....w.......... */
     $"0000 0000 0000 0000 0078 0011 0014 0015"    /* .........x...... */
-    $"0171 000E D9D9 0B0B 0000 0000 007F 0011"    /* .q.............. */
-    $"0014 0015 0071 000E 0000 0000 0000 0000"    /* .....q.......... */
-    $"00BD 0011 0014 0015 0171 000E 0000 0000"    /* .........q...... */
-    $"0000 0000 00CF 0011 0014 0015 0071 000E"    /* .............q.. */
+    $"01CB 000E D9D9 0B0B 0000 0000 007F 0011"    /* ................ */
+    $"0014 0015 00CB 000E 0000 0000 0000 0000"    /* ................ */
+    $"00BD 0011 0014 0015 01CB 000E 0000 0000"    /* ................ */
+    $"0000 0000 00CF 0011 0014 0015 00CB 000E"    /* ................ */
     $"0000 0000 0000 0000 012E 0011 0014 0016"    /* ................ */
-    $"0471 000E 0000 2D2D 9999 0000 0155 000E"    /* .q....--.....U.. */
-    $"0011 0015 0071 000C 0000 0000 0000"         /* .....q........ */
+    $"04CB 000E 0000 2D2D 9999 0000 0155 000E"    /* ......--.....U.. */
+    $"0011 0015 00CB 000C 0000 0000 0000"         /* .............. */
 };
 
diff --git a/resources/installers/windows/jubler.nsi b/resources/installers/windows/jubler.nsi
@@ -137,18 +137,18 @@ SectionEnd
 
 ; JRE Installation
 ;--------------------------------
-!define JRE_VERSION "1.7"
-!define JRE_URL http://jubler.googlecode.com/files/java_${WINBITS}_7u21.exe
+!define JRE_VERSION "1.8"
+!define JRE_URL https://sourceforge.net/projects/jubler/files/Helper%20Applications/jre-8u73-windows-i586-iftw.exe/download
 Section "Java Runtime Environment" SecJRE
 
   ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   StrCmp $2 ${JRE_VERSION} done	; We have already the correct version of JRE
 
-  StrCpy $2 "$TEMP\Java Runtime Environment 7.exe"
+  StrCpy $2 "$TEMP\Java Runtime Environment.exe"
   nsisdl::download /TIMEOUT=30000 ${JRE_URL} $2
   Pop $R0 ;Get the return value
   StrCmp $R0 "success" done
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Download failed ($R0).$\nRemember to manually download Java 7 before launching Jubler."
+    MessageBox MB_OK|MB_ICONEXCLAMATION "Download failed ($R0).$\nRemember to manually download Java before launching Jubler."
     Quit
   done:
   HideWindow

diff --git a/resources/libs/jupidator/jupidator.jar b/resources/libs/jupidator/jupidator.jar
diff --git a/resources/libs/jupidator/update.xml b/resources/libs/jupidator/update.xml
@@ -44,7 +44,20 @@
         <launcher exec="${APPHOME}\Jubler.exe"/>
     </architect>
 
-    <version release="1298" version="5.0.3">
+1322
+    <version release="1322" version="5.1">
+        <description>
+            SubRip filter now better recognises broken subtitles. In OS X, only Oracle's JRE is supported and PPC support is dropped.
+        <description>
+    </version>
+
+    <version release="1300" version="5.0.6">
+        <description>
+            Mac OS X only version. Fix packaging issues and updated to latest java launcher.
+        </description>
+    </version>
+
+    <version release="1298" version="5.0.5">
         <description>
             Fix subtitles will not open with double click. Fix missing character per minute display in subtitle view.
         </description>