Menu
▾
▴
[Bsf4oorexx-svn] SF.net SVN: bsf4oorexx:[340] gui_installers/mac/Iceberg
|
From: <or...@us...> - 2016-03-16 19:01:28
|
Revision: 340
http://sourceforge.net/p/bsf4oorexx/code/340
Author: orexx
Date: 2016-03-16 19:01:25 +0000 (Wed, 16 Mar 2016)
Log Message:
-----------
20160316 Relocated the framework files, adjusted a bit, basically working for 64-bit again (tweaking bitness for AOO/LO, defaulting to 64 bit)
Modified Paths:
--------------
gui_installers/mac/Iceberg/installation/scripts/AOO_install_support.sh
gui_installers/mac/Iceberg/installation/scripts/AOO_uninstall_support.sh
gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_install_postflight.sh
gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_uninstall_preflight.sh
gui_installers/mac/Iceberg/installation/scripts/macinstallinfo.rex
gui_installers/mac/Iceberg/installation/scripts/ooRexx_install_postflight.sh
gui_installers/mac/Iceberg/installation/scripts/ooRexx_uninstall_preflight.sh
gui_installers/mac/Iceberg/ooRexx32withBSF4ooRexx.packproj
gui_installers/mac/Iceberg/ooRexx64withBSF4ooRexx.packproj
gui_installers/mac/Iceberg/readme-create-installer.txt
gui_installers/mac/Iceberg/testCopy2Destinations.sh
gui_installers/mac/Iceberg/testRemoveDestinations.sh
Modified: gui_installers/mac/Iceberg/installation/scripts/AOO_install_support.sh
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/AOO_install_support.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/AOO_install_support.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -33,7 +33,9 @@
OOO_APP_DIR=/Applications/OpenOffice.org.app
LO_APP_DIR=/Applications/LibreOffice.app
-BSF4OOREXX_FRAMEWORK=/System/Library/Frameworks/BSF4ooRexx.framework
+# BSF4OOREXX_FRAMEWORK=/System/Library/Frameworks/BSF4ooRexx.framework
+BSF4OOREXX_FRAMEWORK=/Library/Frameworks/BSF4ooRexx.framework
+
SCRIPTLIB_SRC=$BSF4OOREXX_FRAMEWORK/Libraries/OOo_ScriptLibraries
# BIN_DIR=/usr/bin
@@ -49,8 +51,13 @@
else
LIPO_BITNESS=`rexx /Applications/ooRexx.app/Contents/Resources/macinstallinfo.rex lipoBitness`
if [ "$LIPO_BITNESS" = "" ] ; then
- osascript -e 'tell app "System Events" to display dialog "'$0': cannot get bitness from Rexx script, aborting '$0'!" buttons "OK" default button 1 with title "Problem: Cannot run Rexx script" with icon 1'
- exit -1
+
+# TODO: 2016-03-16, rgf: the call to rexx is not returning anything, assuming a 64-bit installation of ooRexx
+# osascript -e 'tell app "System Events" to display dialog "'$0': cannot get bitness from Rexx script, aborting '$0'!" buttons "OK" default button 1 with title "Problem: Cannot run Rexx script" with icon 1'
+# exit -1
+ osascript -e 'tell app "System Events" to display dialog "'$0': cannot get bitness from Rexx script, assuming 64-bit AOO/LO !" buttons "OK" default button 1 with title "Problem: Cannot run Rexx script" with icon 1'
+ LIPO_BITNESS=x86_64
+
fi
fi
Modified: gui_installers/mac/Iceberg/installation/scripts/AOO_uninstall_support.sh
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/AOO_uninstall_support.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/AOO_uninstall_support.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -26,7 +26,10 @@
# -----------------------------------------------------------------------------
SCRIPT_NAME="$0: "
-BSF4OOREXX_FRAMEWORK=/System/Library/Frameworks/BSF4ooRexx.framework
+# BSF4OOREXX_FRAMEWORK=/System/Library/Frameworks/BSF4ooRexx.framework
+# 2016-03-16, ---rgf: MacOSX 10.11 (El Capitan)
+BSF4OOREXX_FRAMEWORK=/Library/Frameworks/BSF4ooRexx.framework
+
# BIN_DIR=/usr/bin
BIN_DIR=/usr/local/bin
Modified: gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_install_postflight.sh
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_install_postflight.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_install_postflight.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -28,10 +28,16 @@
SCRIPT_NAME="$0: "
-FRAMEWORK_SYS_DIR=/System/Library/Frameworks
+# osascript -e 'tell app "System Events" to display dialog "$0: at start of script" buttons "OK" default button 1 with title "Debug info #1" with icon 1'
+
+
+# FRAMEWORK_SYS_DIR=/System/Library/Frameworks
+FRAMEWORK_SYS_DIR=/Library/Frameworks
+
BSF4OOREXX_FRAMEWORK=$FRAMEWORK_SYS_DIR/BSF4ooRexx.framework
OOREXX_FRAMEWORK=$FRAMEWORK_SYS_DIR/ooRexx.framework
+
# BIN_DIR=/usr/bin
# LIB_DIR=/usr/lib
# JAVA_LIB_DIR=/usr/lib/java
@@ -51,7 +57,6 @@
mkdir -pvm 755 $LIB_DIR
fi
-
# 20160315 putting dylib (Java 1.6 and 1.8 list it in 'java.library.path')
JAVA_LIB_DIR=/Library/Java/Extensions
@@ -60,6 +65,8 @@
# ----------------------------------------------------------------------
# install ooRexx and start, use BSF4ooRexx ooRexx.app scripts
+# osascript -e 'tell app "System Events" to display dialog "$0: about to call \$OOREXX_APP_DIR/Contents/Resources/ooRexx_install_postflight.sh" buttons "OK" default button 1 with title "Debug info #2" with icon 1'
+
# use ooRexx.framework, if available, assuming from this installation, hence force links to point to it
if [ -d $OOREXX_FRAMEWORK ] ; then
echo "${SCRIPT_NAME}$OOREXX_FRAMEWORK exists!"
@@ -67,6 +74,8 @@
sh $OOREXX_APP_DIR/Contents/Resources/ooRexx_install_postflight.sh
fi
+# osascript -e 'tell app "System Events" to display dialog "$0: about to call =\`rexx $OOREXX_APP_DIR/Contents/Resources/macinstallinfo.rex lipoBitness\`" buttons "OK" default button 1 with title "Debug info #3" with icon 1'
+
# get bitness string used in lipo (i386, x86_64), which depends on bitness of installed ooRexx
BITNESS=`rexx $OOREXX_APP_DIR/Contents/Resources/macinstallinfo.rex lipoBitness`
echo ${SCRIPT_NAME}"using ooRexx \$BITNESS set to [$BITNESS] ..."
@@ -118,6 +127,8 @@
mkdir -pvm 755 $JAVA_LIB_DIR
fi
+# osascript -e 'tell app "System Events" to display dialog "$0: about to call ln -sf $BSF4OOREXX_FRAMEWORK/Libraries/libBSF4ooRexx.dylib $LIB_DIR" buttons "OK" default button 1 with title "Debug info #4" with icon 1'
+
ln -sf $BSF4OOREXX_FRAMEWORK/Libraries/libBSF4ooRexx.dylib $LIB_DIR
ln -sf $BSF4OOREXX_FRAMEWORK/Libraries/libBSF4ooRexx.dylib $JAVA_LIB_DIR
@@ -135,6 +146,9 @@
echo "export NLSPATH=\$NLSPATH:/usr/local/bin/rexx.cat" >> /etc/profile
+
+# osascript -e 'tell app "System Events" to display dialog "$0: about to run sh $OOREXX_APP_DIR/Contents/Resources/AOO_install_support.sh " buttons "OK" default button 1 with title "Debug info #5" with icon 1'
+
# ----------------------------------------------------------------------
# --- install AOO/LO support
echo ""
@@ -147,4 +161,7 @@
echo "${SCRIPT_NAME}finishing up..."
echo ""
+# osascript -e 'tell app "System Events" to display dialog "$0: AFTER installing AOO/LO support, about to do a lsregister -kill -r -domain system -domain local -domain user " buttons "OK" default button 1 with title "Debug info #6" with icon 1'
+
+
/System/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/LaunchServices.framework/Versions/Current/Support/lsregister -kill -r -domain system -domain local -domain user
Modified: gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_uninstall_preflight.sh
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_uninstall_preflight.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/BSF4ooRexx_uninstall_preflight.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -45,7 +45,9 @@
echo "${SCRIPT_NAME}COMMAND=[$COMMAND], COMMAND2=[$COMMAND2], COMMAND_CP=[$COMMAND_CP]"
-FRAMEWORK_SYS_DIR=/System/Library/Frameworks
+# FRAMEWORK_SYS_DIR=/System/Library/Frameworks
+FRAMEWORK_SYS_DIR=/Library/Frameworks
+
BSF4OOREXX_FRAMEWORK=$FRAMEWORK_SYS_DIR/BSF4ooRexx.framework
PREFIX=$BSF4OOREXX_FRAMEWORK
Modified: gui_installers/mac/Iceberg/installation/scripts/macinstallinfo.rex
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/macinstallinfo.rex 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/macinstallinfo.rex 2016-03-16 19:01:25 UTC (rev 340)
@@ -3,13 +3,15 @@
/*
author: Rony G. Flatscher
date: 2013-07-24
+ changed: 2016-03-16, rgf: ooRexx 4.2.0 will be the minimum ooRexx interpreter bundled, which
+ encodes its bitness in PARSE VERSION (e.g. "REXX-ooRexx_4.2.0(MT)_64-bit 6.04 17 Mar 2014")
purpose: helper for determining Rexx bitness driving the installation's bitness as well
usage: macinstallinfo.rex bitness | lipoBitness
store to: ooRexx.app/Contents/Resources
license:
# ------------------------ Apache Version 2.0 license -------------------------
-# Copyright (C) 2013 Rony G. Flatscher
+# Copyright (C) 2013, 2016 Rony G. Flatscher
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,6 +33,8 @@
select
when option~caselessCompareTo("bitness")=0 | option~caselessCompareTo("lipoBitness")=0 then
do
+ parse version ')_' bitness '-bit' -- fetch bitness the ooRexx > 4.2 way
+/*
"rexx -v | rxqueue"
bitness=""
do while queued()>0
@@ -39,6 +43,7 @@
else
parse pull .
end
+*/
if option~caselessCompareTo("bitness")=0 then say bitness -- return bitness (32 or 64)
else if bitness=32 then say "i386" -- return 32-bit lipo string
else say "x86_64" -- return 64-bit lipo string
Modified: gui_installers/mac/Iceberg/installation/scripts/ooRexx_install_postflight.sh
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/ooRexx_install_postflight.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/ooRexx_install_postflight.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -25,7 +25,8 @@
# -----------------------------------------------------------------------------
SCRIPT_NAME="$0: "
-PREFIX=/System/Library/Frameworks/ooRexx.framework
+# PREFIX=/System/Library/Frameworks/ooRexx.framework
+PREFIX=/Library/Frameworks/ooRexx.framework
# ---
Modified: gui_installers/mac/Iceberg/installation/scripts/ooRexx_uninstall_preflight.sh
===================================================================
--- gui_installers/mac/Iceberg/installation/scripts/ooRexx_uninstall_preflight.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/installation/scripts/ooRexx_uninstall_preflight.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -26,7 +26,8 @@
# -----------------------------------------------------------------------------
SCRIPT_NAME="$0: "
-PREFIX=/System/Library/Frameworks/ooRexx.framework
+# PREFIX=/System/Library/Frameworks/ooRexx.framework
+PREFIX=/Library/Frameworks/ooRexx.framework
# uncomment to just echo the commands for testing and debugging
# TEST_RUN=true
Modified: gui_installers/mac/Iceberg/ooRexx32withBSF4ooRexx.packproj
===================================================================
--- gui_installers/mac/Iceberg/ooRexx32withBSF4ooRexx.packproj 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/ooRexx32withBSF4ooRexx.packproj 2016-03-16 19:01:25 UTC (rev 340)
@@ -168,7 +168,40 @@
</dict>
<dict>
<key>Children</key>
- <array/>
+ <array>
+ <dict>
+ <key>Children</key>
+ <array/>
+ <key>GID</key>
+ <integer>0</integer>
+ <key>Path</key>
+ <string>tmp/sources32/BSF4ooRexx.framework</string>
+ <key>Path Type</key>
+ <integer>2</integer>
+ <key>Privileges</key>
+ <integer>493</integer>
+ <key>Type</key>
+ <integer>3</integer>
+ <key>UID</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Children</key>
+ <array/>
+ <key>GID</key>
+ <integer>0</integer>
+ <key>Path</key>
+ <string>tmp/sources32/ooRexx.framework</string>
+ <key>Path Type</key>
+ <integer>2</integer>
+ <key>Privileges</key>
+ <integer>493</integer>
+ <key>Type</key>
+ <integer>3</integer>
+ <key>UID</key>
+ <integer>0</integer>
+ </dict>
+ </array>
<key>GID</key>
<integer>80</integer>
<key>Path</key>
@@ -316,40 +349,7 @@
</dict>
<dict>
<key>Children</key>
- <array>
- <dict>
- <key>Children</key>
- <array/>
- <key>GID</key>
- <integer>0</integer>
- <key>Path</key>
- <string>tmp/sources32/BSF4ooRexx.framework</string>
- <key>Path Type</key>
- <integer>2</integer>
- <key>Privileges</key>
- <integer>493</integer>
- <key>Type</key>
- <integer>3</integer>
- <key>UID</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Children</key>
- <array/>
- <key>GID</key>
- <integer>0</integer>
- <key>Path</key>
- <string>tmp/sources32/ooRexx.framework</string>
- <key>Path Type</key>
- <integer>2</integer>
- <key>Privileges</key>
- <integer>493</integer>
- <key>Type</key>
- <integer>3</integer>
- <key>UID</key>
- <integer>0</integer>
- </dict>
- </array>
+ <array/>
<key>GID</key>
<integer>0</integer>
<key>Path</key>
@@ -573,7 +573,7 @@
<key>IFPkgDescriptionTitle</key>
<string>ooRexx 4.2.0 with BSF4ooRexx 4.52 (32 Bit) - beta</string>
<key>IFPkgDescriptionVersion</key>
- <string>452.20160315</string>
+ <string>452.20150825</string>
</dict>
</dict>
<key>Display Information</key>
@@ -617,14 +617,14 @@
<key>IFMajorVersion</key>
<integer>4</integer>
<key>IFMinorVersion</key>
- <integer>51</integer>
+ <integer>52</integer>
</dict>
</dict>
</dict>
<key>IFPkgFlagPackageSelection</key>
<integer>0</integer>
<key>Name</key>
- <string>ooRexx420_WithBSF4ooRexx452.20160315-i386-MacOSX-beta</string>
+ <string>ooRexx420_WithBSF4ooRexx452.20160316-i386-MacOSX-beta</string>
<key>Status</key>
<integer>1</integer>
<key>Type</key>
Modified: gui_installers/mac/Iceberg/ooRexx64withBSF4ooRexx.packproj
===================================================================
--- gui_installers/mac/Iceberg/ooRexx64withBSF4ooRexx.packproj 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/ooRexx64withBSF4ooRexx.packproj 2016-03-16 19:01:25 UTC (rev 340)
@@ -168,7 +168,40 @@
</dict>
<dict>
<key>Children</key>
- <array/>
+ <array>
+ <dict>
+ <key>Children</key>
+ <array/>
+ <key>GID</key>
+ <integer>0</integer>
+ <key>Path</key>
+ <string>tmp/sources64/BSF4ooRexx.framework</string>
+ <key>Path Type</key>
+ <integer>2</integer>
+ <key>Privileges</key>
+ <integer>493</integer>
+ <key>Type</key>
+ <integer>3</integer>
+ <key>UID</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Children</key>
+ <array/>
+ <key>GID</key>
+ <integer>0</integer>
+ <key>Path</key>
+ <string>tmp/sources64/ooRexx.framework</string>
+ <key>Path Type</key>
+ <integer>2</integer>
+ <key>Privileges</key>
+ <integer>493</integer>
+ <key>Type</key>
+ <integer>3</integer>
+ <key>UID</key>
+ <integer>0</integer>
+ </dict>
+ </array>
<key>GID</key>
<integer>80</integer>
<key>Path</key>
@@ -316,40 +349,7 @@
</dict>
<dict>
<key>Children</key>
- <array>
- <dict>
- <key>Children</key>
- <array/>
- <key>GID</key>
- <integer>0</integer>
- <key>Path</key>
- <string>tmp/sources64/BSF4ooRexx.framework</string>
- <key>Path Type</key>
- <integer>2</integer>
- <key>Privileges</key>
- <integer>493</integer>
- <key>Type</key>
- <integer>3</integer>
- <key>UID</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Children</key>
- <array/>
- <key>GID</key>
- <integer>0</integer>
- <key>Path</key>
- <string>tmp/sources64/ooRexx.framework</string>
- <key>Path Type</key>
- <integer>2</integer>
- <key>Privileges</key>
- <integer>493</integer>
- <key>Type</key>
- <integer>3</integer>
- <key>UID</key>
- <integer>0</integer>
- </dict>
- </array>
+ <array/>
<key>GID</key>
<integer>0</integer>
<key>Path</key>
@@ -573,7 +573,7 @@
<key>IFPkgDescriptionTitle</key>
<string>ooRexx 4.2.0 with BSF4ooRexx 4.52 (64 Bit) -beta</string>
<key>IFPkgDescriptionVersion</key>
- <string>452.20160315</string>
+ <string>452.20150825</string>
</dict>
</dict>
<key>Display Information</key>
@@ -617,7 +617,7 @@
<key>IFMajorVersion</key>
<integer>4</integer>
<key>IFMinorVersion</key>
- <integer>51</integer>
+ <integer>52</integer>
</dict>
</dict>
</dict>
Modified: gui_installers/mac/Iceberg/readme-create-installer.txt
===================================================================
--- gui_installers/mac/Iceberg/readme-create-installer.txt 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/readme-create-installer.txt 2016-03-16 19:01:25 UTC (rev 340)
@@ -33,9 +33,9 @@
sudo hdiutil create -volname ooRexxWithBSF4ooRexx-i386 -srcfolder ~/dev/bsf4oorexx/gui_installers/mac/Iceberg/tmp/build32/ooRexx420_WithBSF4ooRexx452.20150812-i386-MacOSX-beta.pkg -ov -format UDZO ooRexx420_WithBSF4ooRexx452.20150812-i386-MacOSX-beta.pkg
-sudo hdiutil create -volname ooRexxWithBSF4ooRexx-x86_64-MacOSX.pkg -srcfolder ~/dev/bsf4oorexx/gui_installers/mac/Iceberg/tmp/build64/ooRexx420_WithBSF4ooRexx452.20150812-x86_64-MacOSX-beta.pkg -ov -format UDZO ooRexx420_WithBSF4ooRexx452.20150812-x86_64-MacOSX-beta.pkg
+sudo hdiutil create -volname ooRexxWithBSF4ooRexx-x86_64-MacOSX.pkg -srcfolder ~/dev/bsf4oorexx/gui_installers/mac/Iceberg/tmp/build64/ooRexx420_WithBSF4ooRexx452.20160315-x86_64-MacOSX-beta.pkg -ov -format UDZO ooRexx420_WithBSF4ooRexx452.20160315-x86_64-MacOSX-beta.pkg
----rgf, 2013-08-03, 2013-08-12, 2014-01-21, 2014-03-17, 2014-03-30, 2014-05-26, 2014-10-14, 2015-05-12, 2015-06-10, 2015-07-27, 2015-08-13
+---rgf, 2013-08-03, 2013-08-12, 2014-01-21, 2014-03-17, 2014-03-30, 2014-05-26, 2014-10-14, 2015-05-12, 2015-06-10, 2015-07-27, 2015-08-13, 2016-03-16
Modified: gui_installers/mac/Iceberg/testCopy2Destinations.sh
===================================================================
--- gui_installers/mac/Iceberg/testCopy2Destinations.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/testCopy2Destinations.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -19,7 +19,10 @@
SRC=tmp/sources${BITNESS}
echo "[$SRC]"
-FRM_BASE=/System/Library/Frameworks
+# FRM_BASE=/System/Library/Frameworks
+# 2016-03-16, rgf: starting with MacOSX 10.11 (El Capitan)
+FRM_BASE=/Library/Frameworks
+
APP_BASE=/Applications
ORX_APP=ooRexx.app
Modified: gui_installers/mac/Iceberg/testRemoveDestinations.sh
===================================================================
--- gui_installers/mac/Iceberg/testRemoveDestinations.sh 2016-03-15 21:21:13 UTC (rev 339)
+++ gui_installers/mac/Iceberg/testRemoveDestinations.sh 2016-03-16 19:01:25 UTC (rev 340)
@@ -3,3 +3,7 @@
rm -rf /Applications/ooRexx.app
rm -rf /System/Library/Frameworks/BSF4ooRexx.framework
rm -rf /System/Library/Frameworks/ooRexx.framework
+
+# 2016-03-16, rgf: MacOSX 10.11 (El Capitan) installation locations:
+rm -rf /Library/Frameworks/BSF4ooRexx.framework
+rm -rf /Library/Frameworks/ooRexx.framework
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|