pack.cmd: use name-x.x.x style

modified: kmididec.txt modified: pack.cmd
komh · Sep 2, 2020 · 941249f · 941249f
1 parent 4625dbe
commit 941249f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/kmididec.txt b/kmididec.txt
@@ -1,7 +1,7 @@
                           Upload Information Template for Hobbes.nmsu.edu
                           ===============================================
 
-        Archive Filename: kmididec@SHORT_VER@.zip
+        Archive Filename: kmididec-@VER@.zip
        Short Description: kmididec v@VER@
         Long Description: kmididec v@VER@
 K MIDI DECoder(kmididec) is a library in order to decode MIDI to PCM using

diff --git a/pack.cmd b/pack.cmd
@@ -28,7 +28,7 @@ sDistFiles = 'kmidi.exe' '/',
 sCmd = 'sed -n "s/^#define' sVerMacro '*\\\"\(.*\)\\\"$/\1/p"' sVerHeader
 sVer = getOutput( sCmd )
 sShortVer = removeNonNumbers( sVer )
-sPackageNameVer = sPackageName || sShortVer
+sPackageNameVer = sPackageName || '-' || sVer
 
 'gmake' 'clean'
 'gmake' 'RELEASE=1'
@@ -49,7 +49,8 @@ do while strip( sDistFiles ) \= ''
     'ginstall' sRepoDir || '/' || sSrc sPackageNameVer || sDestDir
 end
 
-'git' 'archive' '--format' 'zip' sVer '>' sPackageNameVer || '/src.zip'
+'git' 'archive' '--format' 'zip' sVer '--prefix' sPackageNameVer || '/' '>',
+      sPackageNameVer || '/' || sPackageNameVer || '-src.zip'
 
 'rm' '-f' sPackageNameVer || '.zip'
 'zip' '-rpSm' sPackageNameVer || '.zip' sPackageNameVer