From 5cd7ab97d9c596321fac209313dac889026e41a0 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Mon, 9 Jun 2014 16:17:19 +0800 Subject: [PATCH] fixed wrong WP8 project name when create project by console. --- .../cocos-project-template.json | 8 +++++++- .../proj.wp8-xaml/{HelloCpp => App}/App.xaml | 0 .../proj.wp8-xaml/{HelloCpp => App}/App.xaml.cs | 0 .../{HelloCpp => App}/Assets/AlignmentGrid.png | Bin .../{HelloCpp => App}/Assets/ApplicationIcon.png | Bin .../Assets/Tiles/FlipCycleTileLarge.png | Bin .../Assets/Tiles/FlipCycleTileMedium.png | Bin .../Assets/Tiles/FlipCycleTileSmall.png | Bin .../Assets/Tiles/IconicTileMediumLarge.png | Bin .../Assets/Tiles/IconicTileSmall.png | Bin .../proj.wp8-xaml/{HelloCpp => App}/EditBox.xaml | 0 .../proj.wp8-xaml/{HelloCpp => App}/EditBox.xaml.cs | 0 .../proj.wp8-xaml/{HelloCpp => App}/HelloCpp.csproj | 2 +- .../{HelloCpp => App}/LocalizedStrings.cs | 0 .../proj.wp8-xaml/{HelloCpp => App}/MainPage.xaml | 0 .../{HelloCpp => App}/MainPage.xaml.cs | 0 .../{HelloCpp => App}/Properties/AppManifest.xml | 0 .../{HelloCpp => App}/Properties/AssemblyInfo.cs | 0 .../{HelloCpp => App}/Properties/WMAppManifest.xml | 0 .../Resources/AppResources.Designer.cs | 0 .../{HelloCpp => App}/Resources/AppResources.resx | 0 .../{HelloCpp => App}/SplashScreenImage.jpg | Bin .../HelloCppComponent.vcxproj | 0 .../HelloCppComponent.vcxproj.filters | 0 .../{HelloCppComponent => AppComponent}/pch.cpp | 0 .../{HelloCppComponent => AppComponent}/pch.h | 0 .../cpp-template-default/proj.wp8-xaml/HelloCpp.sln | 4 ++-- 27 files changed, 10 insertions(+), 4 deletions(-) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/App.xaml (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/App.xaml.cs (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/AlignmentGrid.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/ApplicationIcon.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/Tiles/FlipCycleTileLarge.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/Tiles/FlipCycleTileMedium.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/Tiles/FlipCycleTileSmall.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/Tiles/IconicTileMediumLarge.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Assets/Tiles/IconicTileSmall.png (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/EditBox.xaml (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/EditBox.xaml.cs (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/HelloCpp.csproj (98%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/LocalizedStrings.cs (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/MainPage.xaml (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/MainPage.xaml.cs (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Properties/AppManifest.xml (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Properties/AssemblyInfo.cs (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Properties/WMAppManifest.xml (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Resources/AppResources.Designer.cs (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/Resources/AppResources.resx (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCpp => App}/SplashScreenImage.jpg (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCppComponent => AppComponent}/HelloCppComponent.vcxproj (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCppComponent => AppComponent}/HelloCppComponent.vcxproj.filters (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCppComponent => AppComponent}/pch.cpp (100%) rename templates/cpp-template-default/proj.wp8-xaml/{HelloCppComponent => AppComponent}/pch.h (100%) diff --git a/templates/cpp-template-default/cocos-project-template.json b/templates/cpp-template-default/cocos-project-template.json index 7246f50171..ab35bb7a12 100644 --- a/templates/cpp-template-default/cocos-project-template.json +++ b/templates/cpp-template-default/cocos-project-template.json @@ -11,7 +11,11 @@ "proj.win32/PROJECT_NAME.vcxproj.filters", "proj.win32/PROJECT_NAME.vcxproj.user", "proj.win32/PROJECT_NAME.sln", - "proj.ios_mac/PROJECT_NAME.xcodeproj" + "proj.ios_mac/PROJECT_NAME.xcodeproj", + "proj.wp8-xaml/PROJECT_NAME.sln", + "proj.wp8-xaml/App/PROJECT_NAME.csproj", + "proj.wp8-xaml/AppComponent/PROJECT_NAMEComponent.vcxproj", + "proj.wp8-xaml/AppComponent/PROJECT_NAMEComponent.vcxproj.filters" ] }, "project_replace_project_name":{ @@ -22,6 +26,8 @@ "proj.win32/PROJECT_NAME.vcxproj.user", "proj.win32/PROJECT_NAME.sln", "proj.win32/main.cpp", + "proj.wp8-xaml/App/PROJECT_NAME.csproj", + "proj.wp8-xaml/PROJECT_NAME.sln", "proj.android/.project", "proj.android/.cproject", "proj.android/AndroidManifest.xml", diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/App.xaml b/templates/cpp-template-default/proj.wp8-xaml/App/App.xaml similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/App.xaml rename to templates/cpp-template-default/proj.wp8-xaml/App/App.xaml diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/App.xaml.cs b/templates/cpp-template-default/proj.wp8-xaml/App/App.xaml.cs similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/App.xaml.cs rename to templates/cpp-template-default/proj.wp8-xaml/App/App.xaml.cs diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/AlignmentGrid.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/AlignmentGrid.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/ApplicationIcon.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/ApplicationIcon.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/FlipCycleTileLarge.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/FlipCycleTileLarge.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/FlipCycleTileMedium.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/FlipCycleTileMedium.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/FlipCycleTileSmall.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/FlipCycleTileSmall.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/IconicTileMediumLarge.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/IconicTileMediumLarge.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png b/templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/IconicTileSmall.png similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png rename to templates/cpp-template-default/proj.wp8-xaml/App/Assets/Tiles/IconicTileSmall.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/EditBox.xaml b/templates/cpp-template-default/proj.wp8-xaml/App/EditBox.xaml similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/EditBox.xaml rename to templates/cpp-template-default/proj.wp8-xaml/App/EditBox.xaml diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/EditBox.xaml.cs b/templates/cpp-template-default/proj.wp8-xaml/App/EditBox.xaml.cs similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/EditBox.xaml.cs rename to templates/cpp-template-default/proj.wp8-xaml/App/EditBox.xaml.cs diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/HelloCpp.csproj b/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj similarity index 98% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/HelloCpp.csproj rename to templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj index 8a4e7717a8..8d686b7879 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/HelloCpp.csproj +++ b/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj @@ -130,7 +130,7 @@ - + HelloCppComponent diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/LocalizedStrings.cs b/templates/cpp-template-default/proj.wp8-xaml/App/LocalizedStrings.cs similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/LocalizedStrings.cs rename to templates/cpp-template-default/proj.wp8-xaml/App/LocalizedStrings.cs diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/MainPage.xaml b/templates/cpp-template-default/proj.wp8-xaml/App/MainPage.xaml similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/MainPage.xaml rename to templates/cpp-template-default/proj.wp8-xaml/App/MainPage.xaml diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/MainPage.xaml.cs b/templates/cpp-template-default/proj.wp8-xaml/App/MainPage.xaml.cs similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/MainPage.xaml.cs rename to templates/cpp-template-default/proj.wp8-xaml/App/MainPage.xaml.cs diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/AppManifest.xml b/templates/cpp-template-default/proj.wp8-xaml/App/Properties/AppManifest.xml similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/AppManifest.xml rename to templates/cpp-template-default/proj.wp8-xaml/App/Properties/AppManifest.xml diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/AssemblyInfo.cs b/templates/cpp-template-default/proj.wp8-xaml/App/Properties/AssemblyInfo.cs similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/AssemblyInfo.cs rename to templates/cpp-template-default/proj.wp8-xaml/App/Properties/AssemblyInfo.cs diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/WMAppManifest.xml b/templates/cpp-template-default/proj.wp8-xaml/App/Properties/WMAppManifest.xml similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/WMAppManifest.xml rename to templates/cpp-template-default/proj.wp8-xaml/App/Properties/WMAppManifest.xml diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Resources/AppResources.Designer.cs b/templates/cpp-template-default/proj.wp8-xaml/App/Resources/AppResources.Designer.cs similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Resources/AppResources.Designer.cs rename to templates/cpp-template-default/proj.wp8-xaml/App/Resources/AppResources.Designer.cs diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Resources/AppResources.resx b/templates/cpp-template-default/proj.wp8-xaml/App/Resources/AppResources.resx similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Resources/AppResources.resx rename to templates/cpp-template-default/proj.wp8-xaml/App/Resources/AppResources.resx diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/SplashScreenImage.jpg b/templates/cpp-template-default/proj.wp8-xaml/App/SplashScreenImage.jpg similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCpp/SplashScreenImage.jpg rename to templates/cpp-template-default/proj.wp8-xaml/App/SplashScreenImage.jpg diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/HelloCppComponent.vcxproj b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/HelloCppComponent.vcxproj rename to templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/HelloCppComponent.vcxproj.filters b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/HelloCppComponent.vcxproj.filters rename to templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/pch.cpp b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.cpp similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/pch.cpp rename to templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.cpp diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/pch.h b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.h similarity index 100% rename from templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/pch.h rename to templates/cpp-template-default/proj.wp8-xaml/AppComponent/pch.h diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln index a0798281da..bbbc9ab846 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln +++ b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloCpp", "HelloCpp\HelloCpp.csproj", "{83CC88FE-7E79-4E1E-A129-742987130B5C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloCpp", "App\HelloCpp.csproj", "{83CC88FE-7E79-4E1E-A129-742987130B5C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCppComponent", "HelloCppComponent\HelloCppComponent.vcxproj", "{60EC6889-C3C4-45AD-A006-47D9EE689212}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCppComponent", "AppComponent\HelloCppComponent.vcxproj", "{60EC6889-C3C4-45AD-A006-47D9EE689212}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}" EndProject