Fix blop install dir; Define version in file

Signed-off-by: falkTX <falktx@falktx.com>

VERSION

@@ -0,0 +1 @@
+0.0.2

pack-plugins.sh

@@ -45,6 +45,7 @@ function create_innosetup_exe {
     local pkgdir="${PAWPAW_BUILDDIR}/innosetup-6.0.5"
     local iscc="${pkgdir}/drive_c/InnoSeup/ISCC.exe"
 
+    echo "#define VERSION \"$(cat VERSION)\"" > /tmp/pawpaw/version.iss
     env WINEARCH="${PAWPAW_TARGET}" WINEPREFIX="${pkgdir}" wine "${iscc}" "setup/inno/${PAWPAW_TARGET}.iss"
 }
 
@@ -54,8 +55,8 @@ if [ "${WIN32}" -eq 1 ]; then
     download_and_install_innosetup
     rm -rf /tmp/pawpaw
     mkdir /tmp/pawpaw
-    touch /tmp/pawpaw/components.txt
-    touch /tmp/pawpaw/lv2bundles.txt
+    touch /tmp/pawpaw/components.iss
+    touch /tmp/pawpaw/lv2bundles.iss
     PAWPAW_WINE_LV2DIR="Z:$(echo ${PAWPAW_PREFIX} | tr -t '/' '\\')\\lib\\lv2\\"
 fi
 
@@ -74,12 +75,12 @@ for plugin in ${@}; do
     lv2bundles=($(jq -crM .lv2bundles[] ${pfile}))
 
     if [ "${WIN32}" -eq 1 ]; then
-        echo "Name: ${sname}; Description: \"${name}\"; Types: full;" >> /tmp/pawpaw/components.txt
+        echo "Name: ${sname}; Description: \"${name}\"; Types: full;" >> /tmp/pawpaw/components.iss
     fi
 
     for lv2bundle in ${lv2bundles[@]}; do
         if [ "${WIN32}" -eq 1 ]; then
-            echo "Source: \"${PAWPAW_WINE_LV2DIR}${lv2bundle}\\*\"; DestDir: \"{commoncf}\\LV2\\${lv2bundle}\"; Components: ${sname}; Flags: recursesubdirs" >> /tmp/pawpaw/lv2bundles.txt
+            echo "Source: \"${PAWPAW_WINE_LV2DIR}${lv2bundle}\\*\"; DestDir: \"{commoncf}\\LV2\\${lv2bundle}\"; Components: ${sname}; Flags: recursesubdirs" >> /tmp/pawpaw/lv2bundles.iss
         fi
     done
 done

plugins/blop.json

@@ -4,5 +4,6 @@
     "version": "e76724d58c39a52e3f47dbff40c011c54d9a0fdb",
     "dlbaseurl": "http://git.drobilla.net/blop.lv2.git",
     "dlmethod": "git",
-    "buildtype": "waf"
+    "buildtype": "waf",
+    "buildargs": "--lv2dir=lib/lv2"
 }

setup/inno/win32.iss

@@ -1,9 +1,11 @@
+#include "Z:\tmp\pawpaw\version.iss"
+
 [Setup]
 AppName=PawPaw
-AppVersion=0.0.0
+AppVersion={#VERSION}
 DefaultDirName={commonpf32}\PawPaw
 DisableDirPage=yes
-OutputBaseFilename=PawPaw-win32-0.0.0
+OutputBaseFilename=PawPaw-win32-v{#VERSION}
 OutputDir=.
 UsePreviousAppDir=no
 
@@ -12,7 +14,7 @@ Name: "full"; Description: "Full installation"
 Name: "custom"; Description: "Custom installation"; Flags: iscustom
 
 [Components]
-#include "Z:\tmp\pawpaw\components.txt"
+#include "Z:\tmp\pawpaw\components.iss"
 
 [Files]
-#include "Z:\tmp\pawpaw\lv2bundles.txt"
+#include "Z:\tmp\pawpaw\lv2bundles.iss"

setup/inno/win64.iss

@@ -1,10 +1,12 @@
+#include "Z:\tmp\pawpaw\version.iss"
+
 [Setup]
 ArchitecturesInstallIn64BitMode=x64
 AppName=PawPaw
-AppVersion=0.0.0
+AppVersion={#VERSION}
 DefaultDirName={commonpf64}\PawPaw
 DisableDirPage=yes
-OutputBaseFilename=PawPaw-win64-0.0.0
+OutputBaseFilename=PawPaw-win64-v{#VERSION}
 OutputDir=.
 UsePreviousAppDir=no
 
@@ -13,7 +15,7 @@ Name: "full"; Description: "Full installation"
 Name: "custom"; Description: "Custom installation"; Flags: iscustom
 
 [Components]
-#include "Z:\tmp\pawpaw\components.txt"
+#include "Z:\tmp\pawpaw\components.iss"
 
 [Files]
-#include "Z:\tmp\pawpaw\lv2bundles.txt"
+#include "Z:\tmp\pawpaw\lv2bundles.iss"