Bumped version to 0.9.37

dov · Jul 27, 2023 · f8b79a3 · f8b79a3
1 parent a582fce
commit f8b79a3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/NEWS b/NEWS
@@ -1,4 +1,10 @@
-Verison 0.9.36:
+Version 0.9.37:
+
+* Added interactive option "I" for toggling image display
+* Added option for showing ballons by default
+* Added support for Quadratic bezier curves
+
+Version 0.9.36:
 
 * Fixed clipping bug of polygons
 * Added logging option for better error reports

diff --git a/SConstruct b/SConstruct
@@ -30,14 +30,14 @@ inp = open("configure.ac")
 for line in inp.readlines():
     m = re.search(r"AM_INIT_AUTOMAKE\(.*,\s*\"?(.*?)\"?\)", line)
     if m:
-        env['VER'] = m.group(1)
+        env['VERSION'] = m.group(1)
         break
 
 # All purpose template filling routine
 def create_dist(env, target, source):
     # Skip if this is not a git repo
     if os.path.exists(".git"):
-        vdir = "giv-%s"%env['VER']
+        vdir = "giv-%s"%env['VERSION']
         os.mkdir(vdir, 0o755)
         os.system("tar -cf - `git ls-files` | (cd %s; tar -xf -); "%vdir)
         os.system("tar -zcf %s.tar.gz %s"%(vdir,vdir))
@@ -62,20 +62,20 @@ if ARGUMENTS.get('mingw', 0) or ARGUMENTS.get('mingw64', 0):
                 "COPYING",
                 ["unix2dos < COPYING > COPYING.dos"])
 
-    env.Command("InstallGiv${VER}-${HOST}.exe",
+    env.Command("InstallGiv${VERSION}-${HOST}.exe",
                 ["src/giv.exe",
                  "src/giv-image.dll",
                  "src/giv-remote-client.exe",
                  "giv.nsi",
                  ] + glob.glob("src/plugins/*.dll"),
-                ["makensis -DHOSTBITS=${HOSTBITS} -DVER=${VER} -DHOST=${HOST} -DSYSROOT=${SYSROOT} -DLIBGCCDLL=${LIBGCCDLL} -DCOMMITIDSHORT=${COMMITIDSHORT} giv.nsi"])
+                ["makensis -DHOSTBITS=${HOSTBITS} -DVERSION=${VERSION} -DHOST=${HOST} -DSYSROOT=${SYSROOT} -DLIBGCCDLL=${LIBGCCDLL} -DCOMMITIDSHORT=${COMMITIDSHORT} giv.nsi"])
     env.Command("Giv.zip",
                 ["src/giv.exe",
                  "src/giv-image.dll",
                  "src/giv-remote-client.exe",
                  "giv.nsi",
                  ] + glob.glob("src/plugins/*.dll"),
-                ["./nsistozip -DHOSTBITS=${HOSTBITS} -DVER=${VER} -DHOST=${HOST} -DSYSROOT=${SYSROOT} -DLIBGCCDLL=${LIBGCCDLL} -DCOMMITIDSHORT=${COMMITIDSHORT} giv.nsi"])
+                ["./nsistozip -DHOSTBITS=${HOSTBITS} -DVERSION=${VERSION} -DHOST=${HOST} -DSYSROOT=${SYSROOT} -DLIBGCCDLL=${LIBGCCDLL} -DCOMMITIDSHORT=${COMMITIDSHORT} giv.nsi"])
 
     env.Append(LINKFLAGS=['-mwindows'])
 
@@ -175,7 +175,7 @@ env.Alias("install",
 
 
 env.Alias("dist",
-          env.Command("giv-${VER}.tar.gz",
+          env.Command("giv-${VERSION}.tar.gz",
                       [],
                       create_dist))
 
diff --git a/configure.ac b/configure.ac
@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
 PACKAGE=givwidget
 GIVWIDGET_API_VERSION=2.0
 
-AM_INIT_AUTOMAKE(giv, 0.9.36)
+AM_INIT_AUTOMAKE(giv, 0.9.37)
 
 dnl Use libtool to get shared libraries
 LT_PREREQ

diff --git a/giv.nsi b/giv.nsi
@@ -1,5 +1,5 @@
 Name "Giv"
-OutFile "InstallGiv-${VER}-${HOST}-${COMMITIDSHORT}.exe"
+OutFile "InstallGiv-${VERSION}-${HOST}-${COMMITIDSHORT}.exe"
 Icon "giv-logo.ico"
 UninstallIcon "giv-logo-install.ico"
 

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 # Work in progress
 project('giv', ['c','cpp','vala'],
-  version : '0.9.36',
+  version : '0.9.37',
   license: 'LGPLv3+')
 
 add_global_arguments('-DSPDLOG_FMT_EXTERNAL',

diff --git a/nsistozip b/nsistozip
@@ -73,7 +73,8 @@ with open(nsi_file) as fh:
 
 print('\n'.join('%s -> %s'%f for f in files))
 
-zipname = 'Giv-'+vars['VER']+'-'+vars['COMMITIDSHORT']
+
+zipname = 'Giv-'+vars['VERSION']+'-'+vars['COMMITIDSHORT']
 z = zipfile.ZipFile(zipname + '.zip',
                     mode='w',
                     compression=zipfile.ZIP_DEFLATED)