Correct filenames

appveyor.yml

@@ -19,14 +19,14 @@ environment:
   USE_GSTREAMER: 1
   KIVY_USE_SETUPTOOLS: 1
   matrix:
+  - PYVER: 27
+    BITTNESS: 86
+  - PYVER: 35
+    BITTNESS: 86
+    COMPILER: msvc
   - PYVER: 35
     BITTNESS: 64
     COMPILER: msvc
-  - PYVER: 35
-    BITTNESS: 86
-    COMPILER: msvc
-  - PYVER: 27
-    BITTNESS: 86
   - PYVER: 34
     BITTNESS: 86
   - PYVER: 27
@@ -100,10 +100,20 @@ build_script:
 
     Check-Error
 
+    $WHEEL_VERSION_T = python -c "import kivy;print(kivy.__version__)" --config "kivy:log_level:error"
+
+    Check-Error
+
+    python -c "from os.path import join;kv=join('$env:APPVEYOR_BUILD_FOLDER','kivy','__init__.py');f=open(kv);s=f.read().replace('$WHEEL_VERSION_T','$WHEEL_VERSION_T`.$WHEEL_DATE`.$GIT_TAG');f.close();f=open(kv,'w');f.write(s);f.close()"
+
+    Check-Error
+
     $WHEEL_VERSION = python -c "import kivy;print(kivy.__version__)" --config "kivy:log_level:error"
 
     Check-Error
 
+    echo "Kivy version is: $WHEEL_VERSION"
+
     python -c "import sys;print('Python version is {}'.format(sys.version))"
 
     Check-Error
@@ -128,6 +138,10 @@ build_script:
 
     if ($env:APPVEYOR_REPO_BRANCH -ne "master") {
       $DO_WHEEL = "False"
+
+      # remove later
+
+      $DO_WHEEL = "True"
     }
 
     echo "test=$env:DO_TEST, make_wheel=$DO_WHEEL"
@@ -227,23 +241,23 @@ build_script:
       Check-Error
     }
 
-
     if ($DO_WHEEL -eq "True") {
       python setup.py bdist_wheel -d "$env:WHEEL_DIR"
       Check-Error
 
-      $WHEEL_FNAME = python -c "from os import listdir;print(listdir(r'$env:WHEEL_DIR')[0])"
+      $WHEEL_FNAME = python -c "from os import listdir;print(listdir(r'$env:WHEEL_DIR')[0])".Replace("_dev0", "")
       Check-Error
-      echo "Copying $env:WHEEL_DIR\$WHEEL_FNAME to $env:WHEEL_DIR\nightly-$WHEEL_FNAME"
-      Copy-Item "$env:WHEEL_DIR\$WHEEL_FNAME" "$env:WHEEL_DIR\nightly-$WHEEL_FNAME"
+
+      echo "Wheel file: $env:WHEEL_DIR\$WHEEL_FNAME"
       Check-Error
-      $NEW_WHEEL_FNAME = python -c "print('$WHEEL_FNAME'.replace('-cp', '$WHEEL_NAME', 1))"
+      $NEW_WHEEL_FNAME = python -c "print('$WHEEL_FNAME'.replace('_dev0','').replace('.$WHEEL_DATE', '').replace('.$GIT_TAG`', ''))"
       Check-Error
-      if ($WHEEL_FNAME -ne $NEW_WHEEL_FNAME) {
-        echo "Renaming from $WHEEL_FNAME to $NEW_WHEEL_FNAME"
-        Rename-Item "$env:WHEEL_DIR\$WHEEL_FNAME" "$NEW_WHEEL_FNAME"
-        Check-Error
-      }
+
+      echo "Copying from $WHEEL_FNAME to nightly $NEW_WHEEL_FNAME"
+      Copy-Item "$env:WHEEL_DIR\$WHEEL_FNAME" "$env:WHEEL_DIR\$NEW_WHEEL_FNAME"
+      Check-Error
+
+      dir "$env:WHEEL_DIR"
 
       C:\Python27\python.exe C:\projects\kivy-sdk-packager\win\gdrive.py upload "$env:GDRIVE_KIVY_UPLOAD_ID" "$env:WHEEL_DIR\*"
       Check-Error