Commit Graph

15 Commits

Author SHA1 Message Date
Benjamin Alterauge
573a184d62 Use python3 to run MakeMacBundleRelocatable.py (#6784)
* To use this script with python 3, fix the incompatible types text and bytes.
2022-05-05 22:47:48 +02:00
Chris Hennes
62bfb44a0d [Tools] Fix static analyis issues
This commit addresses issues identified by LGTM for the various
independent (and mostly-independent) files in the Tools subdirectory.
The vast majority of the issues are trivial, and are things like unused
imports or catching BaseException. There was one true bug identified, a
global variable being changed in a function where it was not marked
global, but it only affected output quantity (the variable is named
"VERBOSE"). A couple of other issues identified variables that appear to
represent no-longer-existing options in the code. The options were left,
but a deprecation printout replaces the variable in the event the option
is provided.
2021-02-28 17:53:04 +01:00
looooo
64002161d6 py3: tools: 2to3 2018-05-23 19:13:54 +02:00
luz.paz
46d32d78a3 Misc. typos: Please merge right before 0.17 release
I'm still finding typos in the source code. I propose that you keep this PR open prior ro relaese and then merge  so that if I find other typos in the meantime they will be part this release.
2018-03-18 15:15:16 +01:00
Kunda
5aefa825b1 Typo fixes for doxygen and source comments
issue #0002914
2017-03-31 11:25:57 -03:00
Bruce B. Lacey
2a88721102 Install macOS bundle executables into MacOS
* Previously, the macOS bundle executables were installed into
    bin which does not adhere to Apple guidelines and causes
    issues with certain frameworks like Qt.  The install has
    been refactored to install the executables into MacOS

Fixes #2928
2017-03-01 09:33:28 +01:00
Bruce B. Lacey
f7babe06f1 Qt5: build FreeCAD for macOS with both Qt5 and Qt4
* Extend Travis config to build and deploy FreeCAD on
     macOS with Qt5, in addition to Qt4
   * Link PySide wrapper to <bundle>/MacOS
   * Warn on install_name_tool failures (work-around to
     confirmed Apple install_name_tool bug)
   * Reference XCTest "Current" framework versus "A"
2017-02-27 10:30:36 +01:00
Bruce B. Lacey
e8f80da3a1 Packaging: macOS relocation of libraries without children
* macOS install path must be <bundle>/MacOS in order for
    QLibrary to find qt.conf to set the correct bundle paths
  * Refactored to add an explicit graph traversal to set the
    dynamic loader id to handle the case where a bundled
    resource does not have any children
  * Fixed the case where rpaths were not removed from
    libraries without children
  * Improved diagnostics when bundling fail to finds
    a dependent library in the search path

Mantis: #0002886
Refs: #535
2017-02-23 20:28:17 -08:00
Bruce B. Lacey
bb80968e6e Packaging: Set macOS dynamic loader paths
*  DYLD paths are set properly to prevent loading libraries external
     to the bundle
  a. LC_ID_DYLD is set to the basename of the library name (i.e.
     not the absolute path) when it is copied into the bundle
  b. Existing LC_RPATH entries in libraries are removed before adding
     the bundle-relative RPATH
  *  Added configurable diagnostic logging to aid in debugging

Fixes 0002886
2017-02-19 01:16:59 -08:00
looooo
8d8dec9f3d python3: dict.has_key("key") --> "key" in dict 2017-01-20 00:06:58 -02:00
Ian Rees
7a60805a2d Added notes + warnings to mac app bundle tool. 2016-01-27 18:07:08 +13:00
Ian Rees
a600aa237f Add /Library/Frameworks/ to known system libraries
Fixes issue where the 3Dconnexion drivers weren't found in relocateable
mac application bundles.
2016-01-23 19:23:11 +13:00
Ian Rees
8cb77d8d27 Prevent adding duplicate rpaths to bundled libs 2016-01-23 19:23:11 +13:00
Ian Rees
962bd63311 Improves build on MacOS with Homebrew or MacPorts
Squashed commit of the following:

commit e158a2049b922cead90cee4a9d3814093db8d00d
Merge: e7c5c06 d545f5b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Wed Mar 25 17:08:56 2015 +1300

    Merge branch 'mac-app-bundle' into macports-build-1

commit d545f5b0de0efa6a0fd020ac98bb6809d9254019
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 22:30:20 2015 +1300

    Minor fixes to Mac application bundle creation

commit e7c5c0630b47e89fc719259f3d81be724627f915
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:35:34 2015 +1300

    Report error if no OpenCasCADe found

commit 976b51c13a1619acf66b9d4fad5594fee292aa76
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:30:47 2015 +1300

    Detects OCE automatically on Homebrew and MacPorts

commit 1cc477f77f388f2ccb26f3884320819f8cb33249
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Mar 17 15:00:34 2015 +1300

    Find PySide and Shiboken automagically on MacPorts

commit 8bf2ebf7397a1c8c4b1b6f1d97e303f335ab47d7
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 23:05:35 2015 +1300

    Finds the Python include dir and library on OSX

commit 8bba9b2c78cfe65d7c295c4c99f0a176e1281539
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 17:31:43 2015 +1300

    Detects Python executable in MacPorts or Homebrew

commit 349a2e0e5c4d370c331bdb54d80d8f4323db8a6b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 08:25:16 2015 +1300

    Missing correct Python lib is error on cmake-ing

commit 1625fe7c1c7fb2d944b04d93be8cf90d5c829be9
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Mar 15 21:06:08 2015 +1300

    Find PySide's UIC and RCC tools properly on MacPorts
2015-04-01 14:40:34 +02:00
Peter Lama
b52255261d Integrate script for making a relocatable OS X app 2015-02-22 18:23:10 +01:00