GitHub/cyberduck
1
0
Fork 0
mirror of https://github.com/iterate-ch/cyberduck.git synced 2026-05-26 19:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert.

Browse Source 
Former-commit-id: 0e91821650aae1cecbd514f643ae55babece20ec
This commit is contained in:
David Kocher
2016-03-31 09:16:06 +02:00
parent ac9b3d6fac
commit 89889a37bb
4 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cyberduck.xcodeproj/project.pbxproj
-28
View File
@@ -1919,7 +1919,6 @@
470C646B1328CBDD00146FB6 /* CopyFiles */,
47472EEF177F78620090A595 /* CopyFiles */,
47C253691BF0D92800863EAF /* CopyFiles */,
473A4CE91CAC69C800B536E7 /* ShellScript */,
47EFE4E11BED03E7009AC47B /* ShellScript */,
4723B4F01BF13FE8004FF004 /* ShellScript */,
);
@@ -1959,7 +1958,6 @@
47C2AD7D1A268C880047B67A /* Frameworks */,
47C2AD7E1A268C880047B67A /* Resources */,
47D93A041A27607A0006D4AE /* CopyFiles */,
473A4CEA1CAC6B0700B536E7 /* ShellScript */,
);
buildRules = (
);
@@ -2239,32 +2237,6 @@
shellPath = /bin/sh;
shellScript = "find \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Resources\" \\( -name info.xib \\) -type f -delete\nfind \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Resources\" \\( -name classes.xib \\) -type f -delete\nfind \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.app/Contents/Resources\" \\( -name data.dependency \\) -type f -delete\n";
};
473A4CE91CAC69C800B536E7 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "mkdir -p ${TARGET_BUILD_DIR}/${PLUGINS_FOLDER_PATH}/Runtime.jre\ncp -fpRL ${RUNTIME_SOURCE}/ ${TARGET_BUILD_DIR}/${PLUGINS_FOLDER_PATH}/Runtime.jre\nrm ${TARGET_BUILD_DIR}/${PLUGINS_FOLDER_PATH}/Runtime.jre/Contents/MacOS/*.dylib";
};
473A4CEA1CAC6B0700B536E7 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "mkdir -p ${TARGET_BUILD_DIR}/${PLUGINS_FOLDER_PATH}/Runtime.jre\ncp -fpRL ${RUNTIME_SOURCE}/ ${TARGET_BUILD_DIR}/${PLUGINS_FOLDER_PATH}/Runtime.jre\nrm ${TARGET_BUILD_DIR}/${PLUGINS_FOLDER_PATH}/Runtime.jre/Contents/MacOS/*.dylib";
};
47EFE4E11BED03E7009AC47B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
cli/osx/build.xml
+3
View File
@@ -45,6 +45,9 @@
<exec dir="${home}" executable="/usr/bin/xcrun" spawn="false" failonerror="true">
<arg line="xcodebuild -project ${home}/'Cyberduck.xcodeproj' -configuration '${xcode.configuration}' -target '${xcode.target}' ${build.settings}"/>
</exec>
<antcall target="runtime">
<param name="bundle" value="${cli.bundle}"/>
</antcall>
<antcall target="shared-library-install-name">
<param name="oldname" value="/System/Library/Frameworks/JavaVM.framework/Versions/A/JavaVM"/>
<param name="newname" value="${bundle.runtime.lib}"/>
osx/build.xml
+3
View File
@@ -66,6 +66,9 @@
<exec dir="${home}" executable="/usr/bin/xcrun" spawn="false" failonerror="true">
<arg line="xcodebuild -project ${home}/'Cyberduck.xcodeproj' -configuration '${xcode.configuration}' -target '${xcode.target}' ${build.settings}"/>
</exec>
<antcall target="runtime">
<param name="bundle" value="${app.bundle}"/>
</antcall>
<antcall target="shared-library-install-name">
<param name="oldname" value="/System/Library/Frameworks/JavaVM.framework/Versions/A/JavaVM"/>
<param name="newname" value="${bundle.runtime.lib}"/>
runtime.xml
+9
View File
@@ -8,6 +8,15 @@
<property name="bundle.runtime.lib"
value="@executable_path/../PlugIns/Runtime.jre/Contents/Home/lib/server/libjvm.dylib"/>
<target name="runtime">
<mkdir dir="${bundle}/${bundle.runtime}"/>
<!-- Copy runtime -->
<echo message="Copy runtime from ${jvm.runtime.home} to ${bundle}/${bundle.runtime}"/>
<copy todir="${bundle}/${bundle.runtime}" preservelastmodified="true">
<fileset followsymlinks="false" dir="${runtime.dependency}" excludesfile="${home}/runtime-excludes.properties"/>
</copy>
</target>
<target name="shared-library-install-name">
<echo message="Change dynamic shared library install names to ${newname} in ${directory}"/>
<apply executable="/usr/bin/install_name_tool" failonerror="true"