diff --git a/macbuild/Resources/KLayoutEditor.sh b/macbuild/Resources/KLayoutEditor.sh index e566d0d8f..96f2c4c2d 100755 --- a/macbuild/Resources/KLayoutEditor.sh +++ b/macbuild/Resources/KLayoutEditor.sh @@ -3,7 +3,7 @@ # File: KLayoutEditor.sh # # Descriptions: -# This is to invoke "klayout" distributed as a binary package for Mac +# This is to invoke "klayout" with Qt5 distributed as a binary package for Mac # in "editor" mode. # # You may specify style and other options as you like by setting @@ -19,7 +19,7 @@ myKLayout="open -n -a /Applications/klayout.app --args " # Pass command line parameters to klayout # vvvvvvvvvv You may edit the block below vvvvvvvvvv opt_mode="-e" -opt_style="-style=cleanlooks" +opt_style="-style=fusion" opt_others="" # ^^^^^^^^^^ You may edit the block above ^^^^^^^^^^ #=================================================== diff --git a/macbuild/Resources/KLayoutViewer.sh b/macbuild/Resources/KLayoutViewer.sh index 3eb1fdbe0..d0fa2c038 100755 --- a/macbuild/Resources/KLayoutViewer.sh +++ b/macbuild/Resources/KLayoutViewer.sh @@ -3,7 +3,7 @@ # File: KLayoutViewer.sh # # Descriptions: -# This is to invoke "klayout" distributed as a binary package for Mac +# This is to invoke "klayout" with Qt5 distributed as a binary package for Mac # in "viewer" mode. # # You may specify style and other options as you like by setting @@ -19,7 +19,7 @@ myKLayout="open -n -a /Applications/klayout.app --args " # Pass command line parameters to klayout # vvvvvvvvvv You may edit the block below vvvvvvvvvv opt_mode="-ne" -opt_style="-style=motif" +opt_style="-style=windows" opt_others="" # ^^^^^^^^^^ You may edit the block above ^^^^^^^^^^ #=================================================== diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py index 24aafd699..21f8fd439 100755 --- a/macbuild/build4mac.py +++ b/macbuild/build4mac.py @@ -40,6 +40,7 @@ def SetGlobals(): global DebugMode # True if debug mode build global CheckComOnly # True if only for checking the command line parameters to "build.sh" global Deployment # True if deploying the binaries for a package + global DeployVerbose # -verbose=<0-3> level passed to 'macdeployqt' tool global Version # KLayout's version # auxiliary variables on platform global System # 6-tuple from platform.uname() @@ -61,9 +62,10 @@ def SetGlobals(): Usage += " : * key type names below are case insensitive * | \n" Usage += " : 'nil' = not to support the script language | \n" Usage += " : 'Sys' = using the OS standard script language | \n" + Usage += " : Refer to 'macbuild/build4mac_env.py' for details| \n" Usage += " [-q|--qt ] : type=['Qt4MacPorts', 'Qt5MacPorts'] | qt5macports \n" - Usage += " [-r|--ruby ] : type=['nil', 'Sys', 'RubySource'] | sys \n" - Usage += " [-p|--python ] : type=['nil', 'Sys', 'Anaconda27', 'Anaconda36'] | sys \n" + Usage += " [-r|--ruby ] : type=['nil', 'Sys', 'Src24', 'MP24'] | sys \n" + Usage += " [-p|--python ] : type=['nil', 'Sys', 'Ana27', 'Ana36', 'MP36'] | sys \n" Usage += " [-n|--noqtbinding] : don't create Qt bindings for ruby scripts | disabled \n" Usage += " [-m|--make