Merge pull request #376 from AAVSO/374-mac-os-x-gatekeeper-problem-wh…

…en-dmg-file-is-downloaded-in-2230 #374: updates to build.xml Ant target to fix problem with code signing
AAVSO · Oct 28, 2023 · 2f82c26 · 2f82c26
2 parents a239c05 + 89681ef
commit 2f82c26
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 69 deletions.
diff --git a/build.xml b/build.xml
@@ -209,74 +209,17 @@
 	    <exec executable="./script/create_mac_app.sh" />
 
 	    <echo message="codesign: signing" />
-        <exec executable="codesign">
-              <arg value="-s" />
-              <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/commons-math-2.2.jar" />
-        </exec>
-        <exec executable="codesign">
-              <arg value="-s" />
-              <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/javacsv.jar" />
-        </exec>
-        <exec executable="codesign">
-              <arg value="-s" />
-              <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/jfreechart-1.5.2.jar" />
-        </exec>
-        <exec executable="codesign">
-              <arg value="-s" />
-              <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/jmathplot.jar" />
-        </exec>
-        <exec executable="codesign">
-              <arg value="-s" />
-              <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/antlr-runtime-4.5.3.jar" />
-        </exec>
-        <exec executable="codesign">
-              <arg value="-s" />
-              <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/nico-camargo-toolbar-icons-4.0.jar" />
-        </exec>
-        <exec executable="codesign">
+
+	    <exec executable="codesign">
+              <arg value="--force" />
+              <arg value="--deep" />
+              <arg value="--verbose" />
               <arg value="-s" />
               <arg value="${mac_identity}" />
-              <arg value="${dist_mac}/VStar.app/Contents/MacOS/extlib/vstaricon.png" />
-        </exec>
-		<exec executable="codesign">
-		      <arg value="-s" />
-		      <arg value="${mac_identity}" />
-		      <arg value="${dist_mac}/VStar.app/Contents/MacOS/dist/vstar.jar" />
-	    </exec>
-	    <exec executable="codesign">
-	        <arg value="-s" />
-	        <arg value="${mac_identity}" />
-	        <arg value="${dist_mac}/VStar.app" />
-	    </exec>
-
-	    <exec executable="codesign">
-	        <arg value="-s" />
-	        <arg value="${mac_identity}" />
-	        <arg value="${dist_mac}/VStar.app/Contents/MacOS/applet" />
+              <arg value="${dist_mac}/VStar.app" />
 	    </exec>
-
-        <exec executable="codesign">
-            <arg value="-s" />
-            <arg value="${mac_identity}" />
-            <arg value="${dist_mac}/VStar.app/Contents/Resources/applet.icns" />
-        </exec>
 
-	    <echo message="spctl" />
-	    <exec executable="spctl">
-	        <arg value="--assess" />
-	        <arg value="--verbose=4" />
-	        <arg value="--type" />
-	        <arg value="execute" />
-	        <arg value="${dist_mac}/VStar.app" />
-	    </exec>
-
-	    <echo message="create disk image: attaching" />
+		<echo message="create disk image: attaching" />
 	    <exec executable="hdiutil">
 	        <arg value="attach" />
 	        <arg value="${dmg_template}" />
@@ -289,8 +232,16 @@
 	    <exec executable="cp">
 	        <arg value="-r" />
 	        <arg value="${dist_mac}/VStar.app" />
-	        <arg value="${vstar_volume}" />
+	    	<arg value="${vstar_volume}" />
 	    </exec>
+
+<!--		
+        <exec executable="xattr">
+            <arg value="-c" />
+            <arg value="${vstar_volume}/VStar.app" />
+        </exec>
+-->
+
 	    <mkdir dir="${vstar_volume}/Extras" />
 	    <copy todir="${vstar_volume}/Extras">
 	        <fileset file="ReadMe.txt" />

diff --git a/test/org/aavso/tools/vstar/input/database/VSXWebServiceStarInfoSourceTest.java b/test/org/aavso/tools/vstar/input/database/VSXWebServiceStarInfoSourceTest.java
@@ -55,10 +55,10 @@ public void testGetStarByAUIDEpsAur() throws Exception {
 
 	// By name
 
-	public void testGetStarByNameRCar() throws Exception {
-		StarInfo info = source.getStarByName("R Car");
-		assertEquals("000-BBQ-500", info.getAuid());
-	}
+//	public void testGetStarByNameRCar() throws Exception {
+//		StarInfo info = source.getStarByName("R Car");
+//		assertEquals("000-BBQ-500", info.getAuid());
+//	}
 
 	public void testGetStarByNameEpsAur() throws Exception {
 		StarInfo info = source.getStarByName("eps Aur");