Skip to content

Commit

Permalink
Revert "these changes enable the web inspector for osx only."
Browse files Browse the repository at this point in the history
Will move to the osx_app.py rather than app.py
This reverts commit 306f559.
  • Loading branch information
Alan DuBoff committed May 11, 2011
1 parent 306f559 commit 4921dec
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion sdk/__init__.py
@@ -1,2 +1,2 @@
def get_titanium_version():
return '1.2.0.RC1'
return '1.2.0'
8 changes: 1 addition & 7 deletions sdk/app.py
Expand Up @@ -125,7 +125,7 @@ def write_tiapp(self, path):
def get_contents_dir(self):
return self.stage_dir

def stage(self, stage_dir, bundle=False, no_install=False, js_obfuscate=False, package=False):
def stage(self, stage_dir, bundle=False, no_install=False, js_obfuscate=False):
print('Staging %s' % self.name)
self.stage_dir = fix_path(stage_dir)
contents = self.contents = self.get_contents_dir()
Expand Down Expand Up @@ -169,12 +169,6 @@ def stage(self, stage_dir, bundle=False, no_install=False, js_obfuscate=False, p
exec_cmd = "java -jar " + '"' + compiler_jar + '"' + " --js " + '"' + source_file + '"' + " --compilation_level SIMPLE_OPTIMIZATIONS --js_output_file " + '"' + output_file + '"'
os.system(exec_cmd)

if 'Darwin' in platform.platform() and package:
defaults_exec = "defaults write " + self.id + " WebKitDeveloperExtras -bool false";
elif 'Darwin' in platform.platform() and not package:
defaults_exec = "defaults write " + self.id + " WebKitDeveloperExtras -bool true";
os.system(defaults_exec);

# If we are not including the installer and this is bundled, do not copy
# the installer and make the app as installed.
if no_install and bundle:
Expand Down
4 changes: 2 additions & 2 deletions sdk/linux_app.py
Expand Up @@ -4,8 +4,8 @@
from app import App

class LinuxApp(App):
def stage(self, stage_dir, bundle, no_install, js_obfuscate, package):
App.stage(self, stage_dir, bundle=bundle, no_install=no_install, js_obfuscate=js_obfuscate, package=package)
def stage(self, stage_dir, bundle, no_install, js_obfuscate):
App.stage(self, stage_dir, bundle=bundle, no_install=no_install, js_obfuscate=js_obfuscate)

contents = self.get_contents_dir()
self.env.log(u'Copying kboot to %s' % contents)
Expand Down
4 changes: 2 additions & 2 deletions sdk/osx_app.py
Expand Up @@ -9,11 +9,11 @@ class OSXApp(App):
def get_contents_dir(self):
return p.join(self.stage_dir, 'Contents')

def stage(self, stage_dir, bundle, no_install, js_obfuscate, package):
def stage(self, stage_dir, bundle, no_install, js_obfuscate):
if not stage_dir.endswith('.app'):
stage_dir += '.app'

App.stage(self, stage_dir, bundle=bundle, no_install=no_install, js_obfuscate=js_obfuscate, package=package)
App.stage(self, stage_dir, bundle=bundle, no_install=no_install, js_obfuscate=js_obfuscate)

self.env.log(u'Copying kboot to %s' % self.contents)
self.executable_path = p.join(self.contents, 'MacOS', self.name)
Expand Down
2 changes: 1 addition & 1 deletion sdk/tibuild.py
Expand Up @@ -117,7 +117,7 @@ def dequote(s):

environment = env.PackagingEnvironment(options.platform, packager, options.appstore)
app = environment.create_app(appdir)
app.stage(path.join(options.destination, app.name), bundle=bundle, no_install=no_install, js_obfuscate=options.js_obfuscate, package=options.package)
app.stage(path.join(options.destination, app.name), bundle=bundle, no_install=no_install, js_obfuscate=options.js_obfuscate)

# Always create the package on the packaging server.
if options.package or packager:
Expand Down
4 changes: 2 additions & 2 deletions sdk/win32_app.py
Expand Up @@ -19,8 +19,8 @@
import PyRTF

class Win32App(App):
def stage(self, stage_dir, bundle, no_install, js_obfuscate, package):
App.stage(self, stage_dir, bundle=bundle, no_install=no_install, js_obfuscate=js_obfuscate, package=package)
def stage(self, stage_dir, bundle, no_install, js_obfuscate):
App.stage(self, stage_dir, bundle=bundle, no_install=no_install, js_obfuscate=js_obfuscate)

contents = self.get_contents_dir()
self.env.log(u'Copying kboot.exe to %s' % contents);
Expand Down

0 comments on commit 4921dec

Please sign in to comment.