Merge pull request Alinshans#50 from Alinshans/v2

Ⓜ️ Modify the VS files location.
wangxukun · Aug 19, 2017 · 168eaa3 · 168eaa3
2 parents a68aa05 + 09766b0
commit 168eaa3
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 89 deletions.
diff --git a/MyTinySTL.sln → MSVC/MyTinySTL_VS2015.sln b/MyTinySTL.sln → MSVC/MyTinySTL_VS2015.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyTinySTL", "MyTinySTL\MyTinySTL.vcxproj", "{E88807F6-B07C-4371-BD38-FB1569F894E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MyTinySTL", "MyTinySTL_VS2015.vcxproj", "{E88807F6-B07C-4371-BD38-FB1569F894E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/MyTinySTL/MyTinySTL.vcxproj → MSVC/MyTinySTL_VS2015.vcxproj b/MyTinySTL/MyTinySTL.vcxproj → MSVC/MyTinySTL_VS2015.vcxproj
@@ -162,35 +162,35 @@
     <ClInclude Include="..\Test\unordered_map_test.h" />
     <ClInclude Include="..\Test\unordered_set_test.h" />
     <ClInclude Include="..\Test\vector_test.h" />
-    <ClInclude Include="algo.h" />
-    <ClInclude Include="algobase.h" />
-    <ClInclude Include="algorithm.h" />
-    <ClInclude Include="alloc.h" />
-    <ClInclude Include="allocator.h" />
-    <ClInclude Include="basic_string.h" />
-    <ClInclude Include="construct.h" />
-    <ClInclude Include="deque.h" />
-    <ClInclude Include="exceptdef.h" />
-    <ClInclude Include="functional.h" />
-    <ClInclude Include="hashtable.h" />
-    <ClInclude Include="unordered_map.h" />
-    <ClInclude Include="unordered_set.h" />
-    <ClInclude Include="heap_algo.h" />
-    <ClInclude Include="iterator.h" />
-    <ClInclude Include="list.h" />
-    <ClInclude Include="map.h" />
-    <ClInclude Include="memory.h" />
-    <ClInclude Include="numeric.h" />
-    <ClInclude Include="queue.h" />
-    <ClInclude Include="rb_tree.h" />
-    <ClInclude Include="set.h" />
-    <ClInclude Include="set_algo.h" />
-    <ClInclude Include="stack.h" />
-    <ClInclude Include="astring.h" />
-    <ClInclude Include="type_traits.h" />
-    <ClInclude Include="uninitialized.h" />
-    <ClInclude Include="util.h" />
-    <ClInclude Include="vector.h" />
+    <ClInclude Include="..\MyTinySTL\algo.h" />
+    <ClInclude Include="..\MyTinySTL\algobase.h" />
+    <ClInclude Include="..\MyTinySTL\algorithm.h" />
+    <ClInclude Include="..\MyTinySTL\alloc.h" />
+    <ClInclude Include="..\MyTinySTL\allocator.h" />
+    <ClInclude Include="..\MyTinySTL\basic_string.h" />
+    <ClInclude Include="..\MyTinySTL\construct.h" />
+    <ClInclude Include="..\MyTinySTL\deque.h" />
+    <ClInclude Include="..\MyTinySTL\exceptdef.h" />
+    <ClInclude Include="..\MyTinySTL\functional.h" />
+    <ClInclude Include="..\MyTinySTL\hashtable.h" />
+    <ClInclude Include="..\MyTinySTL\unordered_map.h" />
+    <ClInclude Include="..\MyTinySTL\unordered_set.h" />
+    <ClInclude Include="..\MyTinySTL\heap_algo.h" />
+    <ClInclude Include="..\MyTinySTL\iterator.h" />
+    <ClInclude Include="..\MyTinySTL\list.h" />
+    <ClInclude Include="..\MyTinySTL\map.h" />
+    <ClInclude Include="..\MyTinySTL\memory.h" />
+    <ClInclude Include="..\MyTinySTL\numeric.h" />
+    <ClInclude Include="..\MyTinySTL\queue.h" />
+    <ClInclude Include="..\MyTinySTL\rb_tree.h" />
+    <ClInclude Include="..\MyTinySTL\set.h" />
+    <ClInclude Include="..\MyTinySTL\set_algo.h" />
+    <ClInclude Include="..\MyTinySTL\stack.h" />
+    <ClInclude Include="..\MyTinySTL\astring.h" />
+    <ClInclude Include="..\MyTinySTL\type_traits.h" />
+    <ClInclude Include="..\MyTinySTL\uninitialized.h" />
+    <ClInclude Include="..\MyTinySTL\util.h" />
+    <ClInclude Include="..\MyTinySTL\vector.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Test\test.cpp" />

diff --git a/MyTinySTL/MyTinySTL.vcxproj.filters → MSVC/MyTinySTL_VS2015.vcxproj.filters b/MyTinySTL/MyTinySTL.vcxproj.filters → MSVC/MyTinySTL_VS2015.vcxproj.filters
@@ -5,12 +5,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Test">
-      <UniqueIdentifier>{ec314ff3-dcde-4cac-a63a-4f6827750d0a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Test\Lib">
-      <UniqueIdentifier>{c6f24d77-e6f0-439e-954a-c0ca577689d5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -19,144 +13,150 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
+    <Filter Include="test">
+      <UniqueIdentifier>{ec314ff3-dcde-4cac-a63a-4f6827750d0a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="test\Lib">
+      <UniqueIdentifier>{c6f24d77-e6f0-439e-954a-c0ca577689d5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="type_traits.h">
+    <ClInclude Include="..\MyTinySTL\type_traits.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="construct.h">
+    <ClInclude Include="..\MyTinySTL\construct.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="alloc.h">
+    <ClInclude Include="..\MyTinySTL\alloc.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="allocator.h">
+    <ClInclude Include="..\MyTinySTL\allocator.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="uninitialized.h">
+    <ClInclude Include="..\MyTinySTL\uninitialized.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="iterator.h">
+    <ClInclude Include="..\MyTinySTL\iterator.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="numeric.h">
+    <ClInclude Include="..\MyTinySTL\numeric.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="algobase.h">
+    <ClInclude Include="..\MyTinySTL\algobase.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="heap_algo.h">
+    <ClInclude Include="..\MyTinySTL\heap_algo.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="set_algo.h">
+    <ClInclude Include="..\MyTinySTL\set_algo.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="algo.h">
+    <ClInclude Include="..\MyTinySTL\algo.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="algorithm.h">
+    <ClInclude Include="..\MyTinySTL\algorithm.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="vector.h">
+    <ClInclude Include="..\MyTinySTL\vector.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="memory.h">
+    <ClInclude Include="..\MyTinySTL\memory.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="list.h">
+    <ClInclude Include="..\MyTinySTL\list.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="deque.h">
+    <ClInclude Include="..\MyTinySTL\deque.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="stack.h">
+    <ClInclude Include="..\MyTinySTL\stack.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="queue.h">
+    <ClInclude Include="..\MyTinySTL\queue.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="functional.h">
+    <ClInclude Include="..\MyTinySTL\functional.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="rb_tree.h">
+    <ClInclude Include="..\MyTinySTL\rb_tree.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="set.h">
+    <ClInclude Include="..\MyTinySTL\set.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="map.h">
+    <ClInclude Include="..\MyTinySTL\map.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="hashtable.h">
+    <ClInclude Include="..\MyTinySTL\hashtable.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="basic_string.h">
+    <ClInclude Include="..\MyTinySTL\basic_string.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="unordered_set.h">
+    <ClInclude Include="..\MyTinySTL\unordered_set.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="unordered_map.h">
+    <ClInclude Include="..\MyTinySTL\unordered_map.h">
       <Filter>include</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\algorithm_performance_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\algorithm_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\deque_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\list_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\map_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\queue_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\set_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\stack_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\string_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\unordered_map_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\unordered_set_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\vector_test.h">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\Lib\redbud\platform.h">
-      <Filter>Test\Lib</Filter>
+      <Filter>test\Lib</Filter>
     </ClInclude>
     <ClInclude Include="..\Test\Lib\redbud\io\color.h">
-      <Filter>Test\Lib</Filter>
+      <Filter>test\Lib</Filter>
     </ClInclude>
-    <ClInclude Include="astring.h">
+    <ClInclude Include="..\MyTinySTL\astring.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="util.h">
+    <ClInclude Include="..\MyTinySTL\util.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="exceptdef.h">
+    <ClInclude Include="..\MyTinySTL\exceptdef.h">
       <Filter>include</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Test\test.cpp">
-      <Filter>Test</Filter>
+      <Filter>test</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ MyTinySTL
 
 如果你想要运行测试，请先阅读 [这个](https://github.com/Alinshans/MyTinySTL/blob/master/Test/README.md) 。
 
-  * linux/osx
+  * gcc/clang on linux/osx
   1. 克隆仓库
 ```bash
 $ git clone [email protected]:Alinshans/MyTinySTL.git
@@ -37,9 +37,9 @@ $ make
 $ cd ../bin && ./stltest
 ```
 
-  * windows
+  * msvc on windows
   1. 克隆仓库或 [Download ZIP](https://github.com/Alinshans/MyTinySTL/archive/master.zip)
-  2. 使用 `vs2015`（或 `vs2017`）打开 `MyTinySTL.sln`，配置成 `Release` 模式，（Ctrl + F5）开始执行。
+  2. 使用 `vs2015`（或 `vs2017`）打开 `MSVC/MyTinySTL_VS2015.sln`，配置成 `Release` 模式，（Ctrl + F5）开始执行。
 
 ## 文档
   见 [Wiki](https://github.com/Alinshans/MyTinySTL/wiki)。
@@ -72,7 +72,7 @@ This is a `tinySTL` based on `C++11`, which is my first project for practice. I
 
 If you want to run the test, please read [this](https://github.com/Alinshans/MyTinySTL/blob/master/Test/README.md) first.
 
-* linux/osx
+* gcc/clang on linux/osx
 
 1. git clone
 ```bash
@@ -87,10 +87,10 @@ $ make
 $ cd ../bin && ./stltest
 ```
 
-* windows
+* msvc on windows
 
 1. git clone or [Download ZIP](https://github.com/Alinshans/MyTinySTL/archive/master.zip)
-2. use `vs2015`(or `vs2017`) open the file `MyTinySTL.sln`, configured in `Release`, run this project(Ctrl + F5).
+2. use `vs2015`(or `vs2017`) open the file `MSVC/MyTinySTL_VS2015.sln`, configured in `Release`, run this project(Ctrl + F5).
 
 ## Documents
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,10 +11,10 @@ configuration:
 
 build:
   parallel: true
-  project: MyTinySTL.sln
+  project: MSVC\MyTinySTL_VS2015.sln
 
 test_script:
-  - cmd: cd .\x64\Release\
+  - cmd: cd .\MSVC\x64\Release\
   - cmd: MyTinySTL.exe
 
 notifications: