rhodes 3.0.2 → 3.1.0.beta.1

data/platform/iphone/Classes/rho/net/NetRequestImpl.m

@@ -1,22 +1,29 @@
-/*
- *  SyncManager.m
- *  RhoSyncClient
- *
- *  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #import <UIKit/UIKit.h>
 #import <sys/socket.h>
 #import <netinet/in.h>

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.1</string>
+	<string>3.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/iphone/Tests/Classes/TestsAppDelegate.h

@@ -1,10 +1,28 @@
-//
-//  TestsAppDelegate.h
-//  Tests
-//
-//  Created by evgeny vovchenko on 5/28/09.
-//  Copyright RhoMobile 2009. All rights reserved.
-//
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>
 

data/platform/iphone/Tests/Classes/TestsAppDelegate.m

@@ -1,10 +1,28 @@
-//
-//  TestsAppDelegate.m
-//  Tests
-//
-//  Created by evgeny vovchenko on 5/28/09.
-//  Copyright RhoMobile 2009. All rights reserved.
-//
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
 #import "TestsAppDelegate.h"
 

data/platform/iphone/main.m

@@ -1,10 +1,28 @@
-//
-//  main.m
-//  Browser
-//
-//  Created by adam blum on 9/4/08.
-//  Copyright __MyCompanyName__ 2008. All rights reserved.
-//
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
 #include <signal.h>
 

data/platform/iphone/rbuild/findRhodesGuid.rb

@@ -1,3 +1,29 @@
+#------------------------------------------------------------------------
+# (The MIT License)
+# 
+# Copyright (c) 2008-2011 Rhomobile, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# http://rhomobile.com
+#------------------------------------------------------------------------
+
 require 'find'
 
 dir = File.dirname(File.expand_path(__FILE__))

data/platform/iphone/rbuild/iphone.rake

@@ -1,4 +1,29 @@
-#
+#------------------------------------------------------------------------
+# (The MIT License)
+# 
+# Copyright (c) 2008-2011 Rhomobile, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# http://rhomobile.com
+#------------------------------------------------------------------------
+
 
 def extract_value_from_strings(line)
    pre_str = '<string>'
@@ -54,6 +79,7 @@ end
 
 
 def set_app_bundle_identifier(newname)
+  name_cleared = newname.downcase.split(/[^a-zA-Z0-9\.\-]/).map{|w| w.downcase}.join("")
   ret_value = ''
   fname = $config["build"]["iphonepath"] + "/Info.plist"
   nextline = false
@@ -62,8 +88,8 @@ def set_app_bundle_identifier(newname)
   File.new(fname,"r").read.each_line do |line|
     if nextline and not replaced
       ret_value = extract_value_from_strings(line)
-      return ret_value if line =~ /#{newname}/
-      buf << line.gsub(/<string>.*<\/string>/,"<string>#{newname}</string>")
+      return ret_value if line =~ /#{name_cleared}/
+      buf << line.gsub(/<string>.*<\/string>/,"<string>#{name_cleared}</string>")
       puts "set bundle identifier"
       replaced = true
     else
@@ -76,6 +102,7 @@ def set_app_bundle_identifier(newname)
 end
 
 def set_app_url_scheme(newname)
+  name_cleared = newname.downcase.split(/[^a-zA-Z0-9\.\-]/).map{|w| w.downcase}.join("")
   ret_value = ''
   fname = $config["build"]["iphonepath"] + "/Info.plist"
   nextline = false
@@ -85,8 +112,8 @@ def set_app_url_scheme(newname)
   File.new(fname,"r").read.each_line do |line|
     if nextline and not replaced
       ret_value = extract_value_from_strings(line)
-      return ret_value if line =~ /#{newname}/
-      buf << line.gsub(/<string>.*<\/string>/,"<string>#{newname}</string>")
+      return ret_value if line =~ /#{name_cleared}/
+      buf << line.gsub(/<string>.*<\/string>/,"<string>#{name_cleared}</string>")
       puts "set URL Scheme"
       replaced = true
     else
@@ -231,7 +258,8 @@ def set_default_images(make_bak)
       if File.exists? imag
         if make_bak
            cp imag, ibak unless File.exists? ibak
-        end 
+        end
+        rm_f imag
       end
       #bundlei = File.join($srcdir, defname + '.png')
       #cp appimage, bundlei unless !File.exist? appimage
@@ -719,6 +747,13 @@ namespace "run" do
       exit $failed.to_i
     end
 
+    task :rhosimulator => "config:common" do    
+    
+        $rhosim_config = "platform='iphone'\r\n"
+        
+        Rake::Task["run:rhosimulator"].invoke
+    end
+
     #<<<<<<<<<
     task :get_log => ["config:iphone"] do
       puts $simapppath
@@ -858,6 +893,7 @@ namespace "run" do
          simlink = File.join($simdir, $sdkver, "Library", "Preferences")
 
          $simrhodes = File.join(simapp, $guid)
+         chmod 0744, File.join($simrhodes, "rhorunner.app", "rhorunner") unless !File.exists?(File.join($simrhodes, "rhorunner.app", "rhorunner"))
 
          mkdir_p File.join($simrhodes, "Documents")
          mkdir_p File.join($simrhodes, "Library", "Preferences")

data/platform/iphone/rhoextlib/dosyscall.c

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "logging/RhoLog.h"
 #include "syscall.h"
 

data/platform/iphone/rhoextlib/syscall.c

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "ruby.h"
 #include "logging/RhoLog.h"
 #include "syscall.h"

data/platform/iphone/rhoextlib/syscall.h

@@ -1,10 +1,29 @@
-/*
- *  syscall.h
- *  rhoextlib
- *
- *  Created by Vlad on 6/8/09.
- *
- */
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #ifndef __RHO_SYSCALL_H__
 #define __RHO_SYSCALL_H__
 

data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj

@@ -845,6 +845,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 1;
 				HEADER_SEARCH_PATHS = (
 					../../shared/ruby,
 					../../shared/ruby/include,
@@ -908,6 +909,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 1;
 				HEADER_SEARCH_PATHS = (
 					../../shared/ruby,
 					../../shared/ruby/include,

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -11,8 +11,8 @@
 		46E9213D0E9BF40A00F14AC8 /* arraylist.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E921280E9BF40A00F14AC8 /* arraylist.h */; };
 		46E9213E0E9BF40A00F14AC8 /* bits.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E9212A0E9BF40A00F14AC8 /* bits.h */; };
 		46E9213F0E9BF40A00F14AC8 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E9212B0E9BF40A00F14AC8 /* config.h */; };
-		46E921400E9BF40A00F14AC8 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 46E9212D0E9BF40A00F14AC8 /* debug.c */; };
-		46E921410E9BF40A00F14AC8 /* debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E9212E0E9BF40A00F14AC8 /* debug.h */; };
+		46E921400E9BF40A00F14AC8 /* json_debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 46E9212D0E9BF40A00F14AC8 /* json_debug.c */; };
+		46E921410E9BF40A00F14AC8 /* json_debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E9212E0E9BF40A00F14AC8 /* json_debug.h */; };
 		46E921420E9BF40A00F14AC8 /* json.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E921300E9BF40A00F14AC8 /* json.h */; };
 		46E921430E9BF40A00F14AC8 /* json_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 46E921310E9BF40A00F14AC8 /* json_object.c */; };
 		46E921440E9BF40A00F14AC8 /* json_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E921320E9BF40A00F14AC8 /* json_object.h */; };
@@ -53,8 +53,8 @@
 		46E9212A0E9BF40A00F14AC8 /* bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bits.h; path = ../../shared/json/bits.h; sourceTree = SOURCE_ROOT; };
 		46E9212B0E9BF40A00F14AC8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../shared/json/config.h; sourceTree = SOURCE_ROOT; };
 		46E9212C0E9BF40A00F14AC8 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../../shared/json/COPYING; sourceTree = SOURCE_ROOT; };
-		46E9212D0E9BF40A00F14AC8 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../../shared/json/debug.c; sourceTree = SOURCE_ROOT; };
-		46E9212E0E9BF40A00F14AC8 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../shared/json/debug.h; sourceTree = SOURCE_ROOT; };
+		46E9212D0E9BF40A00F14AC8 /* json_debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = json_debug.c; path = ../../shared/json/json_debug.c; sourceTree = SOURCE_ROOT; };
+		46E9212E0E9BF40A00F14AC8 /* json_debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_debug.h; path = ../../shared/json/json_debug.h; sourceTree = SOURCE_ROOT; };
 		46E9212F0E9BF40A00F14AC8 /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = INSTALL; path = ../../shared/json/INSTALL; sourceTree = SOURCE_ROOT; };
 		46E921300E9BF40A00F14AC8 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = ../../shared/json/json.h; sourceTree = SOURCE_ROOT; };
 		46E921310E9BF40A00F14AC8 /* json_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = json_object.c; path = ../../shared/json/json_object.c; sourceTree = SOURCE_ROOT; };
@@ -141,8 +141,8 @@
 				46E9212A0E9BF40A00F14AC8 /* bits.h */,
 				46E9212B0E9BF40A00F14AC8 /* config.h */,
 				46E9212C0E9BF40A00F14AC8 /* COPYING */,
-				46E9212D0E9BF40A00F14AC8 /* debug.c */,
-				46E9212E0E9BF40A00F14AC8 /* debug.h */,
+				46E9212D0E9BF40A00F14AC8 /* json_debug.c */,
+				46E9212E0E9BF40A00F14AC8 /* json_debug.h */,
 				46E9212F0E9BF40A00F14AC8 /* INSTALL */,
 				46E921300E9BF40A00F14AC8 /* json.h */,
 				46E921310E9BF40A00F14AC8 /* json_object.c */,
@@ -208,7 +208,7 @@
 				46E9213D0E9BF40A00F14AC8 /* arraylist.h in Headers */,
 				46E9213E0E9BF40A00F14AC8 /* bits.h in Headers */,
 				46E9213F0E9BF40A00F14AC8 /* config.h in Headers */,
-				46E921410E9BF40A00F14AC8 /* debug.h in Headers */,
+				46E921410E9BF40A00F14AC8 /* json_debug.h in Headers */,
 				46E921420E9BF40A00F14AC8 /* json.h in Headers */,
 				46E921440E9BF40A00F14AC8 /* json_object.h in Headers */,
 				46E921450E9BF40A00F14AC8 /* json_object_private.h in Headers */,
@@ -275,7 +275,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				46E9213C0E9BF40A00F14AC8 /* arraylist.c in Sources */,
-				46E921400E9BF40A00F14AC8 /* debug.c in Sources */,
+				46E921400E9BF40A00F14AC8 /* json_debug.c in Sources */,
 				46E921430E9BF40A00F14AC8 /* json_object.c in Sources */,
 				46E921460E9BF40A00F14AC8 /* json_tokener.c in Sources */,
 				46E921480E9BF40A00F14AC8 /* json_util.c in Sources */,