Revert: Move artifacts to Frameworks directory in bundle.

jliebster · Jul 26, 2019 · 78803c1 · 78803c1
1 parent e708db5
commit 78803c1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/cli/osx/pom.xml b/cli/osx/pom.xml
@@ -45,7 +45,7 @@
                                     <goal>copy-dependencies</goal>
                                 </goals>
                                 <configuration>
-                                    <outputDirectory>${project.build.directory}/duck.bundle/Contents/Frameworks</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/duck.bundle/Contents/Resources</outputDirectory>
                                     <includeTypes>jar</includeTypes>
                                     <includeScope>runtime</includeScope>
                                     <stripClassifier>true</stripClassifier>
@@ -80,7 +80,7 @@
                                             <type>${project.packaging}</type>
                                         </artifactItem>
                                     </artifactItems>
-                                    <outputDirectory>${project.build.directory}/duck.bundle/Contents/Frameworks</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/duck.bundle/Contents/Resources</outputDirectory>
                                 </configuration>
                             </execution>
                             <execution>

diff --git a/codesign.xml b/codesign.xml
@@ -60,7 +60,6 @@
                 line="codesign ${codesign.options} --sign '${codesign.certificate}' --keychain ${codesign.keychain} -v"/>
             <fileset dir="${bundle}/${bundle.frameworks}">
                 <include name="*.dylib"/>
-                <include name="*.jar"/>
             </fileset>
             <srcfile/>
         </apply>

diff --git a/osx/pom.xml b/osx/pom.xml
@@ -65,7 +65,7 @@
                                     <goal>copy-dependencies</goal>
                                 </goals>
                                 <configuration>
-                                    <outputDirectory>${project.build.directory}/Cyberduck.app/Contents/Frameworks</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/Cyberduck.app/Contents/Resources</outputDirectory>
                                     <includeTypes>jar</includeTypes>
                                     <includeScope>runtime</includeScope>
                                     <stripClassifier>true</stripClassifier>
@@ -100,7 +100,7 @@
                                             <type>${project.packaging}</type>
                                         </artifactItem>
                                     </artifactItems>
-                                    <outputDirectory>${project.build.directory}/Cyberduck.app/Contents/Frameworks</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/Cyberduck.app/Contents/Resources</outputDirectory>
                                 </configuration>
                             </execution>
                             <execution>

diff --git a/setup/app/Info.plist b/setup/app/Info.plist
@@ -253,7 +253,7 @@
             <key>StartOnMainThread</key>
             <true/>
             <key>WorkingDirectory</key>
-            <string>$APP_PACKAGE/Contents/Frameworks</string>
+            <string>$APP_PACKAGE/Contents/Resources</string>
             <key>VMOptions</key>
             <string>-client -Djava.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.boot.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.nounpack=true -Djava.awt.headless=true -Dsun.jnu.encoding=utf-8 -Dfile.encoding=utf-8 -Dsun.io.useCanonCaches=false -Djdk.tls.useExtendedMasterSecret=false -Dorg.bouncycastle.asn1.allow_unsafe_integer=true -Xverify:none -XX:+UseG1GC -XX:+UseStringDeduplication</string>
         </dict>

diff --git a/setup/pkg/Info.plist b/setup/pkg/Info.plist
@@ -31,7 +31,7 @@
 			<key>VMOptions</key>
 			<string>-client -Djava.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.boot.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.nounpack=true -Djava.awt.headless=true -Dsun.jnu.encoding=utf-8 -Dfile.encoding=utf-8 -Dsun.io.useCanonCaches=false -Djdk.tls.useExtendedMasterSecret=false -Dorg.bouncycastle.asn1.allow_unsafe_integer=true -Xverify:none</string>
 			<key>WorkingDirectory</key>
-			<string>$APP_PACKAGE/Contents/Frameworks</string>
+			<string>$APP_PACKAGE/Contents/Resources</string>
 		</dict>
         <key>LSMinimumSystemVersion</key>
         <string>${MACOSX_DEPLOYMENT_TARGET}</string>