new dmg build script: pass short name of file to macbuilder

This commit is contained in:
nik
2016-02-09 18:10:48 +03:00
parent ebfec3d71d
commit 5ea84e86ee
2 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -13,6 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import com.intellij.util.PathUtilRt
import org.apache.tools.ant.types.Path
import org.apache.tools.ant.util.SplitClassLoader
import org.codehaus.gant.GantBuilder
@@ -112,7 +114,7 @@ class MacDistributionBuilder {
}
}
sshExec("./signapp_ce.sh ${sitFileName} ${fullBuildNumber} ${macHostProperties.userName} ${macHostProperties.password} \"${macHostProperties.codesignString}\" \"${customJDKTarPath}\"")
sshExec("./signapp_ce.sh ${sitFileName} ${fullBuildNumber} ${macHostProperties.userName} ${macHostProperties.password} \"${macHostProperties.codesignString}\" \"${PathUtilRt.getFileName(customJDKTarPath)}\"")
ftpAction("get", true, null, 3) {
ant.fileset(dir: artifactsPath) {
include(name: "${sitFileName}.sit")
+2 -2
View File
@@ -16,8 +16,8 @@ unzip -q $1.sit -d ~/${EXPLODED}/
rm $1.sit
BUILD_NAME=$(ls ~/${EXPLODED}/)
if [ $# -eq 6 ] && [ -f ~/"${6##*[/|\\]}" ]; then
archiveJDK="${6##*[/|\\]}"
if [ $# -eq 6 ] && [ -f $6 ]; then
archiveJDK="$6"
echo "Modifying Info.plist"
sed -i -e 's/1.6\*/1.6\+/' ~/${EXPLODED}/"$BUILD_NAME"/Contents/Info.plist
jdk=jdk-bundled