MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

build scripts: build help indices for Mac OS distribution only if help is bundled

Browse Source 
This is needed to avoid "Not a directory" error for "English.lproj" directory for products where help isn't bundled.
This commit is contained in:
nik
2017-04-24 17:02:43 +03:00
parent ca791ba4a5
commit 9b9a16e012
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
+2 -1
View File
@@ -187,9 +187,10 @@ class MacDmgBuilder {
}
}
String helpFileName = customizer.getPathToHelpZip(buildContext) != null ? "${customizer.helpId}.help" : "no-help"
String jreFileNameArgument = jreArchivePath != null ? " \"${PathUtilRt.getFileName(jreArchivePath)}\"" : ""
sshExec("$remoteDir/signapp.sh ${targetFileName} ${buildContext.fullBuildNumber} ${this.macHostProperties.userName}"
+ " ${this.macHostProperties.password} \"${this.macHostProperties.codesignString}\"$jreFileNameArgument", "signapp.log")
+ " ${this.macHostProperties.password} \"${this.macHostProperties.codesignString}\" $helpFileName$jreFileNameArgument", "signapp.log")
ftpAction("get", true, null, 3) {
ant.fileset(dir: artifactsPath) {
include(name: "${targetFileName}.sit")
platform/build-scripts/tools/mac/scripts/signapp.sh
+8 -6
View File
@@ -5,6 +5,7 @@ EXPLODED=$2.exploded
USERNAME=$3
PASSWORD=$4
CODESIGN_STRING=$5
HELP_DIR_NAME=$6
cd $(dirname $0)
@@ -19,8 +20,8 @@ unzip -q $1.sit -d ${EXPLODED}/
rm $1.sit
BUILD_NAME=$(ls ${EXPLODED}/)
if [ $# -eq 6 ] && [ -f $6 ]; then
archiveJDK="$6"
if [ $# -eq 7 ] && [ -f $7 ]; then
archiveJDK="$7"
echo "Modifying Info.plist"
sed -i -e 's/1.6\*/1.6\+/' ${EXPLODED}/"$BUILD_NAME"/Contents/Info.plist
jdk=jdk-bundled
@@ -37,11 +38,12 @@ if [ $# -eq 6 ] && [ -f $6 ]; then
rm -f $archiveJDK
fi
HELP_FILE=`ls ${EXPLODED}/"$BUILD_NAME"/Contents/Resources/ | grep -i help`
HELP_DIR=${EXPLODED}/"$BUILD_NAME"/Contents/Resources/"$HELP_FILE"/Contents/Resources/English.lproj/
if [ $HELP_DIR_NAME != "no-help" ]; then
HELP_DIR=${EXPLODED}/"$BUILD_NAME"/Contents/Resources/"$HELP_DIR_NAME"/Contents/Resources/English.lproj/
echo "Building help indices for $HELP_DIR"
hiutil -Cagvf "$HELP_DIR/search.helpindex" "$HELP_DIR"
echo "Building help indices for $HELP_DIR"
hiutil -Cagvf "$HELP_DIR/search.helpindex" "$HELP_DIR"
fi
#enable nullglob option to ensure that 'for' cycles don't iterate if nothing matches to the file pattern
shopt -s nullglob