Merge pull request #2010 from dumganhar/master

issue #1733: Updated template projects. Using the same package name on iOS as which on Android.

template/multi-platform-cpp/proj.ios/AppController.mm

@@ -6,8 +6,7 @@
 //  Copyright 2010 __MyCompanyName__. All rights reserved.
 //
 
-#import "testsAppDelegate.h"
-
+#import "AppController.h"
 #import "EAGLView.h"
 #import "cocos2d.h"
 #import "AppDelegate.h"

template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-16d08667ceb5270f9e4470439591422ff7b4e846
+4d7caebf5ec01e9050f96e5945fcc3c8ee9b3db3

template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-463c2a42ed22e116bb0b5d94a2ccb8c8c4d6e12e
+9e877ea63dd2d4a53a7e283bf0f1c234d5ce69c8

template/multi-platform-js/proj.ios/AppController.h

@@ -1,10 +1,3 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
 
 @class RootViewController;
 

template/multi-platform-js/proj.ios/AppController.mm

@@ -1,10 +1,4 @@
-//
-//  testjsAppController.mm
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
+
 #import <UIKit/UIKit.h>
 #import "AppController.h"
 #import "cocos2d.h"

template/multi-platform-js/proj.ios/Prefix.pch

@@ -1,5 +1,5 @@
 //
-// Prefix header for all source files of the 'testjs' target in the 'testjs' project
+// Prefix header for all source files of the 'HelloJavascript' target in the 'HelloJavascript' project
 //
 
 #ifdef __OBJC__

template/multi-platform-js/proj.ios/RootViewController.mm

@@ -1,10 +1,3 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
 
 #import "RootViewController.h"
 

template/multi-platform-js/proj.ios/main.m

@@ -1,10 +1,4 @@
-//
-//  main.m
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
+
 
 #import <UIKit/UIKit.h>
 

template/multi-platform-js/proj.win32/HelloJavascript.vcxproj

@@ -66,12 +66,12 @@
       <MkTypLibCompatible>false</MkTypLibCompatible>
       <TargetEnvironment>Win32</TargetEnvironment>
       <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
+      <TypeLibraryName>$(IntDir)game.tlb</TypeLibraryName>
+      <HeaderFileName>game.h</HeaderFileName>
       <DllDataFileName>
       </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
+      <InterfaceIdentifierFileName>game_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>game_p.c</ProxyFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -120,12 +120,12 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)\HelloJavascriptRes\" /e /Y</Command
       <MkTypLibCompatible>false</MkTypLibCompatible>
       <TargetEnvironment>Win32</TargetEnvironment>
       <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
+      <TypeLibraryName>$(IntDir)game.tlb</TypeLibraryName>
+      <HeaderFileName>game.h</HeaderFileName>
       <DllDataFileName>
       </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
+      <InterfaceIdentifierFileName>game_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>game_p.c</ProxyFileName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -175,10 +175,10 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)\HelloJavascriptRes\" /e /Y</Command
     <ClInclude Include="..\Classes\AppDelegate.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\testjs.ico" />
+    <None Include="res\game.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="testjs.rc" />
+    <ResourceCompile Include="game.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\cocos2dx\proj.win32\cocos2d.vcxproj">

template/multi-platform-js/proj.win32/HelloJavascript.vcxproj.filters

@@ -32,12 +32,12 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\testjs.ico">
+    <None Include="res\game.ico">
       <Filter>resource</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="testjs.rc">
+    <ResourceCompile Include="game.rc">
       <Filter>resource</Filter>
     </ResourceCompile>
   </ItemGroup>

template/multi-platform-js/proj.win32/game.rc

@@ -42,7 +42,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\testjs.ico"
+IDR_MAINFRAME           ICON                    "res\\game.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -67,12 +67,12 @@ BEGIN
         BLOCK "040904B0"
         BEGIN
             VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "testjs Module\0"
+            VALUE "FileDescription", "game Module\0"
             VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "testjs\0"
+            VALUE "InternalName", "game\0"
             VALUE "LegalCopyright", "Copyright \0"
-            VALUE "OriginalFilename", "testjs.exe\0"
-            VALUE "ProductName", "testjs Module\0"
+            VALUE "OriginalFilename", "game.exe\0"
+            VALUE "ProductName", "game Module\0"
             VALUE "ProductVersion", "1, 0, 0, 1\0"
         END
     END

template/multi-platform-js/proj.win32/resource.h

@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by testjs.RC
+// Used by game.RC
 //
 
 #define IDS_PROJNAME                100