OSX: remove the applescript and env var for omp_set_treads from plist
authorJens Verwiebe <info@jensverwiebe.de>
Wed, 10 Apr 2013 15:22:39 +0000 (15:22 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Wed, 10 Apr 2013 15:22:39 +0000 (15:22 +0000)
build_files/scons/tools/Blender.py
release/darwin/blender.app/Contents/Info.plist
release/darwin/set_simulation_threads.app/Contents/Info.plist [deleted file]
release/darwin/set_simulation_threads.app/Contents/MacOS/applet [deleted file]
release/darwin/set_simulation_threads.app/Contents/PkgInfo [deleted file]
release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt [deleted file]
release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns [deleted file]
release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc [deleted file]
release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf [deleted file]

index 816287c..6058ac0 100644 (file)
@@ -693,10 +693,6 @@ def AppIt(target=None, source=None, env=None):
         commands.getoutput(cmd)
         cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary)
         commands.getoutput(cmd)
-        cmd = 'rm -rf  %s/set_simulation_threads.app'%(installdir) # first clear omp_num_threads applescript
-        commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript
-        commands.getoutput(cmd)
 
 # extract copy system python, be sure to update other build systems
 # when making changes to the files that are copied.
index ecea0e3..0649a20 100644 (file)
        <string>????</string>
        <key>CFBundleVersion</key>
        <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>
-       <key>LSEnvironment</key>
-       <dict>
-               <key>OMP_NUM_THREADS</key>
-               <string>4</string>
-       </dict>
        <key>NSPrincipalClass</key>
        <string>NSApplication</string>
        <key>NSHighResolutionCapable</key>
diff --git a/release/darwin/set_simulation_threads.app/Contents/Info.plist b/release/darwin/set_simulation_threads.app/Contents/Info.plist
deleted file mode 100644 (file)
index eb80955..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleAllowMixedLocalizations</key>
-       <true/>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>applet</string>
-       <key>CFBundleIconFile</key>
-       <string>applet</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>set_simulation_threads</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>aplt</string>
-       <key>LSMinimumSystemVersionByArchitecture</key>
-       <dict>
-               <key>x86_64</key>
-               <string>10.6</string>
-       </dict>
-       <key>LSRequiresCarbon</key>
-       <true/>
-       <key>WindowState</key>
-       <dict>
-               <key>dividerCollapsed</key>
-               <false/>
-               <key>eventLogLevel</key>
-               <integer>-1</integer>
-               <key>name</key>
-               <string>ScriptWindowState</string>
-               <key>positionOfDivider</key>
-               <real>493</real>
-               <key>savedFrame</key>
-               <string>698 332 1163 846 0 0 1920 1178 </string>
-               <key>selectedTabView</key>
-               <string>result</string>
-       </dict>
-</dict>
-</plist>
diff --git a/release/darwin/set_simulation_threads.app/Contents/MacOS/applet b/release/darwin/set_simulation_threads.app/Contents/MacOS/applet
deleted file mode 100755 (executable)
index 0079f4b..0000000
Binary files a/release/darwin/set_simulation_threads.app/Contents/MacOS/applet and /dev/null differ
diff --git a/release/darwin/set_simulation_threads.app/Contents/PkgInfo b/release/darwin/set_simulation_threads.app/Contents/PkgInfo
deleted file mode 100644 (file)
index 3253614..0000000
+++ /dev/null
@@ -1 +0,0 @@
-APPLaplt
\ No newline at end of file
diff --git a/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt b/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
deleted file mode 100644 (file)
index fa56257..0000000
Binary files a/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt and /dev/null differ
diff --git a/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
deleted file mode 100644 (file)
index fcc1f09..0000000
Binary files a/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns and /dev/null differ
diff --git a/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
deleted file mode 100644 (file)
index 540621d..0000000
Binary files a/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc and /dev/null differ
diff --git a/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf b/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
deleted file mode 100644 (file)
index 0d0a60c..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
-{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-}
\ No newline at end of file