Explicitly run cpack with Release config on Travis

To prevent artifact collisions when building fast-forward merged
commits.

.travis.yml

@@ -30,13 +30,11 @@ script:
   - python -m unittest test
 
 after_success:
-  # Get the full repo history before trying to run the archiver.
-  - git fetch --unshallow
-  - ../cmake-3.6.2-Linux-x86_64/bin/cpack
+  - ../cmake-3.6.2-Linux-x86_64/bin/cpack -C Release
   - cd $TRAVIS_BUILD_DIR
   # Need to replace the Bintray config files' version placeholders.
   - VERSION=$(ls build/package/loot_api_python-*.tar.xz | sed 's/build\/package\/loot_api_python-//;s/-Linux.tar.xz//;')
-  - sed -i "s/REPLACE_THIS_VERSION/${VERSION}_${TRAVIS_BRANCH}/" scripts/travis/loot-api.bintray.json
+  - sed -i "s/REPLACE_THIS_VERSION/${VERSION}/" scripts/travis/loot-api.bintray.json
 
 deploy:
   - provider: bintray

CMakeLists.txt

@@ -49,9 +49,9 @@ add_subdirectory(${PYBIND11_EXTRACTED_PATH})
 #######################################
 
 if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-    set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.0-0-g7b97241_dev.7z")
+    set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.1-0-gd8f8dc4_master.7z")
 else()
-    set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.0-0-g7b97241_0.10.0.tar.xz")
+    set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.1-0-gd8f8dc4_master.tar.xz")
 endif()
 
 ExternalProject_Add(loot-api-c++
@@ -145,10 +145,10 @@ IF (GIT_FOUND)
                   OUTPUT_VARIABLE GIT_DESCRIBE_STRING
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    IF (${GIT_DESCRIBE_STRING} MATCHES "HEAD")
-        IF ($ENV{APPVEYOR_REPO_BRANCH})
-          set(GIT_DESCRIBE_STRING $ENV{APPVEYOR_REPO_BRANCH})
-        ENDIF()
+    IF (DEFINED ENV{APPVEYOR_REPO_BRANCH})
+        set(GIT_DESCRIBE_STRING "${GIT_DESCRIBE_STRING}_$ENV{APPVEYOR_REPO_BRANCH}")
+    ELSEIF (DEFINED ENV{TRAVIS_BRANCH})
+        set(GIT_DESCRIBE_STRING "${GIT_DESCRIBE_STRING}_$ENV{TRAVIS_BRANCH}")
     ENDIF()
 ELSE()
     SET (GIT_DESCRIBE_STRING "unknown-version")

appveyor.yml

@@ -26,7 +26,7 @@ after_test:
   - ps: $env:GIT_DESCRIBE = ((git describe --tags --long --always) | Out-String) -replace "`n|`r", ""
 
 artifacts:
-  - path: build\package\loot_api_python-$(GIT_DESCRIBE)-win32.7z
+  - path: build\package\loot_api_python-$(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)-win32.7z
     name: loot_api_python
 
 deploy:

docs/conf.py

@@ -346,5 +346,5 @@ texinfo_documents = [
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'loot_api': ('http://loot.readthedocs.io/en/0.10.0/', None),
+    'loot_api': ('http://loot.readthedocs.io/en/0.10.1/', None),
 }

src/test.py

@@ -38,17 +38,17 @@ class TestLootApi(GameFixture):
     def test_version(self):
         self.assertEqual(Version.major, 0)
         self.assertEqual(Version.minor, 10)
-        self.assertEqual(Version.patch, 0)
+        self.assertEqual(Version.patch, 1)
         self.assertNotEqual(Version.revision, u'')
-        self.assertEqual(Version.string(), "0.10.0")
+        self.assertEqual(Version.string(), "0.10.1")
 
     def test_wrapper_version(self):
         self.assertEqual(WrapperVersion.major, 1)
         self.assertEqual(WrapperVersion.minor, 1)
-        self.assertEqual(WrapperVersion.patch, 1)
+        self.assertEqual(WrapperVersion.patch, 2)
         self.assertNotEqual(WrapperVersion.revision, u'')
         self.assertNotEqual(WrapperVersion.revision, Version.revision)
-        self.assertEqual(WrapperVersion.string(), "1.1.1")
+        self.assertEqual(WrapperVersion.string(), "1.1.2")
 
     def test_create_db(self):
         db = create_database(GameType.tes4, self.game_path, self.local_path)

src/wrapper_version.cpp.in

@@ -27,7 +27,7 @@
 namespace loot {
 const unsigned int WrapperVersion::major = 1;
 const unsigned int WrapperVersion::minor = 1;
-const unsigned int WrapperVersion::patch = 1;
+const unsigned int WrapperVersion::patch = 2;
 const std::string WrapperVersion::revision = "@GIT_COMMIT_STRING@";
 
 std::string WrapperVersion::string() {