Deployments & revisions (#9)

* Deployment fixed.
* New versioning scheme introduced.
* Variable arguments for testing.

JContainers/JContainers.vcxproj

@@ -83,16 +83,20 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Configuration)\Data\SKSE\Plugins\</OutDir>
+    <TargetName>JContainers</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>JContainers64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Configuration)\Data\SKSE\Plugins\</OutDir>
+    <TargetName>JContainers</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>JContainers64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -351,4 +355,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

JContainers/src/jcontainers_constants.h

@@ -5,10 +5,10 @@
 
 namespace collections {
 
-#   define JC_PLUGIN_NAME           "JContainers"
-#   define JC_API_VERSION           3
-#   define JC_FEATURE_VERSION       3
-#   define JC_PATCH_VERSION         64
+#   define JC_PLUGIN_NAME           "JContainers64"
+#   define JC_API_VERSION           4
+#   define JC_FEATURE_VERSION       0
+#   define JC_PATCH_VERSION         0
 
 #   define VER_FILE_VERSION         JC_API_VERSION, JC_FEATURE_VERSION, JC_PATCH_VERSION, 0
 

README.md

@@ -66,7 +66,7 @@ or source code.
 3. After successfull build, run from the command line `python tools\install.py x64\Release`.
    Eventually swap `Release` for `Debug` - depending on what kind of distribution was build and
    actually is wanted in the `dist` folder.
-4. Optionaly, run `python tools\test.py x64\Release\Data\SKSE\Plugins\JContainers.dll`. Again it
+4. Optionaly, run `python tools\test.py x64\Release\Data\SKSE\Plugins\JContainers64.dll`. Again it
    depends whether `Release` or `Debug` builds should be tested. Note however that step 3, must be
    ran first!
 

appveyor.yml

@@ -1,11 +1,10 @@
 image: Visual Studio 2017
-version: '3.0.64.{build}'
+version: '4.0.0.{build}'
 configuration: Release
 platform: x64
 branches:
     only:
         - port64
-        - ci
 
 environment:
     matrix:
@@ -25,7 +24,8 @@ after_build:
     - cmd: python tools\\install.py x64\\Release
 
 test_script:
-    - cmd: python tools\\test.py x64\\Release\\Data\\SKSE\\Plugins\\JContainers.dll
+    - cmd: python tools\\test.py x64\\Release\\Data\\SKSE\\Plugins\\JContainers64.dll
 
 artifacts:
     - path: dist\*
+      name: jcdistro

tools/install.py

@@ -20,7 +20,7 @@ def makepath (*args):
 
 class JCLib(object):
 
-    name = 'JContainers.dll'
+    name = 'JContainers64.dll'
 
     def __init__(self, location):
         import ctypes
@@ -135,7 +135,7 @@ def make_archive (dst, src):
 
     dst = os.path.join (DIST_DIR, 'Data')
     shutil.copytree (config.dataDir, dst, ignore = shutil.ignore_patterns ('*.exp', '*.lib', 'test_data'))
-    make_archive (os.path.join (DIST_DIR, 'JContainers.' + config.jcLib.version ()), dst)
+    make_archive (os.path.join (DIST_DIR, 'JContainers64-v' + config.jcLib.version ()), dst)
     shutil.rmtree (dst, ignore_errors = True)
 
     print ("API example skipped - its under revision...")

tools/test.py

@@ -5,11 +5,13 @@
 
 if __name__ == '__main__':
 
-    if len(sys.argv) < 2:
+    if len (sys.argv) < 2:
         print("Usage: test.py <JContainers DLL filepath>")
         sys.exit(1)
-
-    argv = ('', '--gtest_filter=*.*')
+    elif len (sys.argv) == 2:
+        argv = ('', '--gtest_filter=*.*')
+    else:
+        argv = tuple ([''] + sys.argv[1:])
 
     errno = -1
     try: