add commit number to version, use tascar_os in command line render tools

HoerTech-gGmbH · Mar 11, 2024 · 87a892c · 87a892c
1 parent f2bc907
commit 87a892c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,7 +51,9 @@ def tascar_build_steps(stage_name) {
         sh "cp /mingw64/bin/broadwayd.exe TASCAR"
         sh "cp artwork/*.png TASCAR"
         // Now create the zip file from everything inside the TASCAR dir
-        sh 'zip -r TASCAR-$(grep ^VERSION= config.mk | cut -d= -f2)-windows.zip TASCAR'
+        //sh 'zip -r TASCAR-$(grep ^VERSION= config.mk | cut -d= -f2)-windows.zip TASCAR'
+        sh 'zip -r TASCAR-$(grep TASCARVER libtascar/build/tascarver.h | cut -d\'"\' -f2)-windows.zip TASCAR'
+        grep TASCARVER libtascar/build/tascarver.h | cut -d'"' -f2
         archiveArtifacts 'TASCAR-*-windows.zip'
     }
 }

diff --git a/apps/src/tascar_renderfile.cc b/apps/src/tascar_renderfile.cc
@@ -20,6 +20,7 @@
  */
 
 #include "irrender.h"
+#include "tascar_os.h"
 #include <boost/program_options.hpp>
 #include <stdlib.h>
 #include <time.h>
@@ -48,9 +49,10 @@ int main(int argc, char** argv)
                        "Input sound file (if empty, silence is assumed).");
     desc.add_options()("outputfile,o", po::value<std::string>(),
                        "Output sound file.");
-    desc.add_options()("channelmap,m", po::value<std::string>()->default_value(""),
-                       "List of output channels (zero-base), or empty to use all.\n"
-                       "Example: -m 0-5,8,12");
+    desc.add_options()(
+        "channelmap,m", po::value<std::string>()->default_value(""),
+        "List of output channels (zero-base), or empty to use all.\n"
+        "Example: -m 0-5,8,12");
     desc.add_options()(
         "starttime,t", po::value<double>()->default_value(0),
         "Start time in session corresponding to first output sample.");
@@ -129,7 +131,7 @@ int main(int argc, char** argv)
           chmap.push_back(vrg[0]);
         else if((vrg.size() == 2) && (vrg[0] >= 0) && (vrg[1] >= vrg[0])) {
           for(auto k = vrg[0]; k <= vrg[1]; ++k)
-            if( k >= 0 )
+            if(k >= 0)
               chmap.push_back(k);
         } else {
           throw TASCAR::ErrMsg("Invalid channel range \"" + str + "\".");
@@ -150,7 +152,7 @@ int main(int argc, char** argv)
       out_fname = current_path + out_fname;
     }
     TASCAR::wav_render_t r(tscfile, scene, b_verbose);
-    r.set_channelmap( chmap );
+    r.set_channelmap(chmap);
     if(ism_max != (uint32_t)(-1))
       r.set_ism_order_range(ism_min, ism_max);
     if(in_fname.empty()) {

diff --git a/apps/src/tascar_renderir.cc b/apps/src/tascar_renderir.cc
@@ -19,6 +19,7 @@
  */
 
 #include "irrender.h"
+#include "tascar_os.h"
 #include <boost/program_options.hpp>
 #include <stdlib.h>
 
@@ -69,9 +70,10 @@ int main(int argc, char** argv)
         "Input channel number. This defines from which sound vertex the IR is "
         "measured. Sound vertices are numbered in the order of their "
         "appearance in the session file, starting with zero.");
-    desc.add_options()("channelmap,m", po::value<std::string>()->default_value(""),
-                       "List of output channels (zero-base), or empty to use all.\n"
-                       "Example: -m 0-5,8,12");
+    desc.add_options()(
+        "channelmap,m", po::value<std::string>()->default_value(""),
+        "List of output channels (zero-base), or empty to use all.\n"
+        "Example: -m 0-5,8,12");
     //{"verbose", 0, 0, 'v'},
     desc.add_options()("verbose", "Increase verbosity.");
     po::variables_map vm;
@@ -123,7 +125,7 @@ int main(int argc, char** argv)
           chmap.push_back(vrg[0]);
         else if((vrg.size() == 2) && (vrg[0] >= 0) && (vrg[1] >= vrg[0])) {
           for(auto k = vrg[0]; k <= vrg[1]; ++k)
-            if( k >= 0 )
+            if(k >= 0)
               chmap.push_back(k);
         } else {
           throw TASCAR::ErrMsg("Invalid channel range \"" + str + "\".");
@@ -138,7 +140,7 @@ int main(int argc, char** argv)
     std::string current_path = getcwd(c_respath, PATH_MAX);
     current_path += "/";
     TASCAR::wav_render_t r(tscfile, scene, b_verbose);
-    r.set_channelmap( chmap );
+    r.set_channelmap(chmap);
     if(ism_max != (uint32_t)(-1))
       r.set_ism_order_range(ism_min, ism_max);
     r.render_ir(irlen, fs, current_path + out_fname, starttime, inchannel);