Skip to content

Commit

Permalink
Remvoving Titanium - partial
Browse files Browse the repository at this point in the history
  • Loading branch information
fairwinds committed Nov 11, 2012
1 parent 29cf598 commit f871c6e
Show file tree
Hide file tree
Showing 39 changed files with 64 additions and 64 deletions.
10 changes: 5 additions & 5 deletions SConscript.dist
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ excludes = ['.pdb', '.exp', '.ilk', '.db', '.gitignore','.psd', '.xib'
# This prepares the SDK directory for packaging.
if not(path.exists(sdk_dir)):
os.makedirs(sdk_dir)
effess.lightweight_copy_tree(path.join(build.titanium_sdk_dir, build.os),
effess.lightweight_copy_tree(path.join(build.tide_sdk_dir, build.os),
sdk_dir, exclude=excludes)
effess.copy_to_dir(glob(path.join(build.titanium_sdk_dir, "closure")),
effess.copy_to_dir(glob(path.join(build.tide_sdk_dir, "closure")),
sdk_dir, exclude=excludes)
effess.copy_to_dir(glob(path.join(build.titanium_sdk_dir, "*.py")),
effess.copy_to_dir(glob(path.join(build.tide_sdk_dir, "*.py")),
sdk_dir, exclude=excludes)
effess.copy_to_dir(glob(path.join(build.titanium_sdk_dir, "PyRTF")),
effess.copy_to_dir(glob(path.join(build.tide_sdk_dir, "PyRTF")),
sdk_dir, exclude=excludes)
effess.copy_to_dir(glob(path.join('site_scons', "effess.py")),
sdk_dir, exclude=excludes)
Expand All @@ -62,7 +62,7 @@ if build.is_osx():
os.system('ibtool --errors --warnings --notices ' + \
'--output-format human-readable-text --compile %s %s' % \
(path.join(sdk_dir, 'MainMenu.nib'),
path.join(build.titanium_sdk_dir, 'osx', 'MainMenu.xib')))
path.join(build.tide_sdk_dir, 'osx', 'MainMenu.xib')))

if build.is_win32():
effess.copy_to_dir(build.tp('microsoft', 'Microsoft_VC80_CRT_x86.msm'),
Expand Down
6 changes: 3 additions & 3 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ EnsurePythonVersion(2,5)

build.set_tide_source_dir(path.abspath('src'))

build.titanium_source_dir = path.abspath('.')
build.titanium_sdk_dir = path.join(build.titanium_source_dir, 'sdk')
build.tide_source_dir = path.abspath('.')
build.tide_sdk_dir = path.join(build.tide_source_dir, 'sdk')

# This should only be used for accessing various
# scripts in the tide build directory. All resources
# should instead be built to build.dir
build.tide_build_dir = path.join(build.tide_source_dir, 'build')

build.env.Append(CPPPATH=[
build.titanium_source_dir,
build.tide_source_dir,
build.tide_source_dir,
build.tide_include_dir
])
Expand Down
2 changes: 1 addition & 1 deletion sdk/win32/installer_template.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ${component_refs}
<Custom Action="NetInstall" After="NetInstall.Setup">NOT Installed</Custom>
</InstallExecuteSequence>

<Binary Id="TitaniumInstallerDll" SourceFile=${titanium_installer_dll}/>
<Binary Id="TitaniumInstallerDll" SourceFile=${tide_installer_dll}/>
<Binary Id="BannerBmp" SourceFile=${banner_bmp}/>

<UIRef Id="WixUI_Common" />
Expand Down
4 changes: 2 additions & 2 deletions sdk/win32_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ def package(self, package_dir, bundle):
template_args['license_file'] = quoteattr(license_rtf_path)
template_args['crt_msm'] = quoteattr(p.join(self.sdk_dir, 'installer',
'Microsoft_VC80_CRT_x86.msm'))
template_args['titanium_installer_dll'] = quoteattr(p.join(
self.sdk_dir, 'installer', 'titanium_installer.dll'))
template_args['tide_installer_dll'] = quoteattr(p.join(
self.sdk_dir, 'installer', 'tide_installer.dll'))
template_args['dialog_bmp'] = quoteattr(self.get_installer_image(
'dialog-bmp', p.join(self.sdk_dir, 'default_dialog.bmp')))
template_args['banner_bmp'] = quoteattr(self.get_installer_image(
Expand Down
2 changes: 1 addition & 1 deletion src/installer/osx/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ build.mark_build_target(inst)
lproj_dir = p.join(contents, 'Resources', 'English.lproj')
build.mark_build_target(build.utils.CopyToDir(Glob('*.plist'), contents))
build.mark_build_target(build.utils.CopyToDir([
p.join(build.titanium_sdk_dir, 'osx', 'tidesdk.icns'),
p.join(build.tide_sdk_dir, 'osx', 'tidesdk.icns'),
p.join(build.cwd(), 'dialog-warning.png')], lproj_dir))

for f in Glob('English.lproj/*.xib'):
Expand Down
4 changes: 2 additions & 2 deletions src/installer/win32/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ env['CCFLAGS'] = ccf

env.Append(LIBS=['msi']); # Add the MSI lib.
build.mark_build_target(env.SharedLibrary(
path.join(build.dir, 'sdk', 'installer', 'titanium_installer'),
sources + ['titanium_actions.cpp']))
path.join(build.dir, 'sdk', 'installer', 'tide_installer'),
sources + ['tide_actions.cpp']))
File renamed without changes.
4 changes: 2 additions & 2 deletions src/lang/php/php_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ namespace tide
global->Set("PHP", Value::NewObject(this->binding));
Script::GetInstance()->AddScriptEvaluator(this->binding);

zval *titaniumValue = PHPUtils::ToPHPValue(Value::NewObject(global));
ZEND_SET_SYMBOL(&EG(symbol_table), PRODUCT_NAME, titaniumValue);
zval *tideValue = PHPUtils::ToPHPValue(Value::NewObject(global));
ZEND_SET_SYMBOL(&EG(symbol_table), PRODUCT_NAME, tideValue);
}


Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_api.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_binding.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_binding.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_config.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008-2010 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_module.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/app_module.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/config_utils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/linux/linux_app_binding.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/osx/osx_app_binding.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/properties_binding.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/properties_binding.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008-2010 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/win32/win32_app_binding.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/window_config.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/modules/app/window_config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
8 changes: 4 additions & 4 deletions src/modules/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
bh = File.open(File.join(module_dir_name,"#{name}_binding.h"),'w')
bh.puts <<-END
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down Expand Up @@ -58,7 +58,7 @@ class #{module_name}Binding : public StaticBoundObject
bc = File.open(File.join(module_dir_name,"#{name}_binding.cpp"),'w')
bc.puts <<-END
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand All @@ -80,7 +80,7 @@ class #{module_name}Binding : public StaticBoundObject
mh = File.open(File.join(module_dir_name,"#{name}_module.h"),'w')
mh.puts <<-END
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down Expand Up @@ -120,7 +120,7 @@ class TIDESDK_#{header_define}_API #{module_name}Module : public tide::Module
mc = File.open(File.join(module_dir_name,"#{name}_module.cpp"),'w')
mc.puts <<-END
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2009 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/modules/media/osx/sound_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**//**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand All @@ -47,4 +47,4 @@ using namespace ti;
}
-(void)setOSXSound:(OSXSound*)sound;
-(void)dealloc;
@end
@end
2 changes: 1 addition & 1 deletion src/modules/network/network_binding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace ti
{
GetInterfaceList();

// methods that are available on Titanium.Network
// methods that are available on Ti.Network
/**
* @tiapi(method=True,name=Network.createTCPSocket,since=0.2) Creates a TCPSocket object
* @tiarg(for=Network.createTCPSocket,name=host,type=String) the hostname to connect to
Expand Down
2 changes: 1 addition & 1 deletion src/modules/network/protocols/irc/IRC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Numeorous minor changes by Jeff Haynie <[email protected]> to
get it working well under Titanium
get it working well under TideSDK
*/

#include "IRC.h"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/network/support/tinetworkmodule.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
}

// ok, we'll handle it then...
Titanium.UI.showDialog({
Ti.UI.showDialog({
'url': 'ti://network/update.html',
'width': width,
'height': height,
Expand Down
4 changes: 2 additions & 2 deletions src/modules/process/pipe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ namespace ti
/**
* @tiapi(method=True,name=Process.Pipe.attach,since=0.5)
* @tiapi Attach an IO object to this pipe. An IO object is an object that
* @tiapi implements a public "write(Bytes)". In Titanium, this include
* @tiapi implements a public "write(Bytes)". In Ti, this include
* @tiapi FileStreams, and Pipes. You may also use your own custom IO implementation
* @tiapi here.
*/
Expand Down Expand Up @@ -393,4 +393,4 @@ namespace ti
Poco::Thread::sleep(5);
}
}
}
}
14 changes: 7 additions & 7 deletions src/modules/process/process_binding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ namespace ti
* @tiapi(method=True,name=Process.createProcess,since=0.5)
* @tiapi Create a Process object. There are two main ways to use this function:
* @tiapi With an options object (preferred):
* @tiapi Titanium.Process.createProcess({args: ['mycmd', 'arg1', 'arg2'],
* @tiapi Ti.Process.createProcess({args: ['mycmd', 'arg1', 'arg2'],
* @tiapi env: {'PATH': '/something'}, stdin: pipeIn, stdout: pipeOut, stderr: pipeErr});
* @tiapi OR
* @tiapi Titanium.Process.createProcess(args[, environment, stdin, stdout, stderr]);
* @tiapi Ti.Process.createProcess(args[, environment, stdin, stdout, stderr]);
* @tiresult[Process.Process] The process object
*/
SetMethod("createProcess", &ProcessBinding::CreateProcess);
Expand Down Expand Up @@ -224,7 +224,7 @@ namespace ti
argList = options->GetList("args", 0);
if (argList.isNull())
throw ValueException::FromString(
"Titanium.Process option 'args' must be an array");
"Ti.Process option 'args' must be an array");

environment = options->GetObject("env", 0);

Expand Down Expand Up @@ -273,19 +273,19 @@ namespace ti
if (argList.isNull())
{
throw ValueException::FromString(
"Titanium.Process option argument 'args' was undefined");
"Ti.Process option argument 'args' was undefined");
}

if (argList->Size() == 0)
{
throw ValueException::FromString(
"Titanium.Process option argument 'args' must have at least 1 element");
"Ti.Process option argument 'args' must have at least 1 element");
}
else if (argList->At(0)->IsNull() ||
(argList->At(0)->IsString() && strlen(argList->At(0)->ToString()) == 0))
{
throw ValueException::FromString(
"Titanium.Process 1st argument must not be null/empty");
"Ti.Process 1st argument must not be null/empty");
}

KListRef argsClone = new StaticBoundList();
Expand Down Expand Up @@ -335,4 +335,4 @@ namespace ti
{
result->SetObject(new Pipe());
}
}
}
2 changes: 1 addition & 1 deletion src/modules/ui/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ from os import path
Import('build env module')

env.Append(LIBPATH=[build.get_module('app').dir])
env.Append(CPPPATH = ['%s/src/modules/app' % build.titanium_source_dir])
env.Append(CPPPATH = ['%s/src/modules/app' % build.tide_source_dir])

build.add_thirdparty(env, 'poco')
build.add_thirdparty(env, 'webkit')
Expand Down
4 changes: 2 additions & 2 deletions src/modules/ui/osx/osx_user_window.mm
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ static unsigned int toWindowMask(AutoPtr<WindowConfig> config)
return this->config->GetX();

// Cocoa frame coordinates are absolute on a plane with all
// screens, but Titanium wants them relative to the screen.
// screens, but TideSDK wants them relative to the screen.
NSRect screenFrame = [this->GetWindowScreen() frame];
return [nativeWindow frame].origin.x - screenFrame.origin.x;
}
Expand All @@ -352,7 +352,7 @@ static unsigned int toWindowMask(AutoPtr<WindowConfig> config)
return this->config->GetY();

// Cocoa frame coordinates are absolute on a plane with all
// screens, but Titanium wants them relative to the screen.
// screens, but TideSDK wants them relative to the screen.
NSRect screenFrame = [this->GetWindowScreen() frame];
double y = [nativeWindow frame].origin.y - screenFrame.origin.y;

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/modules/ui/osx/ui_module_osx.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ namespace ti
#include "native_window.h"
#include "osx_user_window.h"
#include "ti_application_delegate.h"
#include "titanium_protocols.h"
#include "ti_protocols.h"

#endif
#endif
4 changes: 2 additions & 2 deletions src/modules/ui/osx/webview_delegate.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Appcelerator Titanium - licensed under the Apache Public License 2
* Appcelerator - licensed under the Apache Public License 2
* see LICENSE in the root folder for details on the license.
* Copyright (c) 2008 Appcelerator, Inc. All Rights Reserved.
*/
Expand Down Expand Up @@ -109,7 +109,7 @@ -(id)initWithWindow:(NativeWindow*)inWindow
// place our user agent string in the global so we can later use it
KObjectRef global = host->GetGlobalObject();
NSString* fullUserAgent = [webView userAgentForURL:
[NSURL URLWithString:@"http://titaniumapp.com"]];
[NSURL URLWithString:@"http://tidesdk.org"]];
global->SetString("userAgent", [fullUserAgent UTF8String]);

return self;
Expand Down
Loading

0 comments on commit f871c6e

Please sign in to comment.