utils: Fixes for make check and release versions

.gitignore

@@ -40,8 +40,9 @@ utils/sotool
 utils/sotool.exe
 pharmml2mdl/pharmml2mdl
 pharmml2poped/pharmml2poped
-utils/pharmmlutils-0.5.0-windows-x64.zip
-utils/pharmmlutils-0.5.0-windows-x64.exe
+utils/*.tar.gz
+utils/pharmmlutils-*-windows-x64.zip
+utils/pharmmlutils-*-windows-x64.exe
 
 test/xml-roundtrip-test/results
 test/xml-roundtrip-test/output

utils/Makefile.am

@@ -8,7 +8,8 @@ EXTRA_DIST = \
 	licenses/LICENSE-2.0.txt \
 	test/testfiles/UseCase1.xml \
 	test/testfiles/Executable_Krippendorff_ModelB.xml \
-	test/testfiles/glucoseKinetics.xml
+	test/testfiles/glucoseKinetics.xml \
+	test/testfiles/pheno_real.SO.xml
 
 transformationsdir = $(pkgdatadir)/transformations
 dist_transformations_DATA = \
@@ -44,13 +45,17 @@ bin_PROGRAMS = pharmmltool sotool
 pharmmltool_LDADD = $(LIBXML2_LIBS) $(LIBXSLT_LIBS)
 pharmmltool_SOURCES = \
 	filesystem.cpp \
+	filesystem.h \
 	common.cpp \
+	common.h \
 	pharmmltool.cpp
 
 sotool_LDADD = $(LIBXML2_LIBS)
 sotool_SOURCES = \
 	filesystem.cpp \
+	filesystem.h \
 	common.cpp \
+	common.h \
 	sotool.cpp
 
 dist_check_SCRIPTS = test/pharmmltool.py test/sotool.py

utils/installer.nsi

@@ -4,8 +4,8 @@
 !define APPNAME "pharmmlutils"
 !define COMPANYNAME "pharmmlcpp"
 !define DESCRIPTION "Utilities for handling PharmML and SO files"
-!define VERSIONMAJOR 0
-!define VERSIONMINOR 5
+!define VERSIONMAJOR 1
+!define VERSIONMINOR 0
 !define VERSIONBUILD 0
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
@@ -24,7 +24,7 @@ LicenseData "LICENSE"
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
 #Icon "logo.ico"
-outFile "../pharmmlutils-0.5.0-windows-x64.exe"
+outFile "../pharmmlutils-1.0.0-windows-x64.exe"
 
 !include LogicLib.nsh
 !include EnvVarUpdate.nsh

utils/test/pharmmltool.py

@@ -47,7 +47,10 @@ def test_validate(self):
         self.assertEqual(l[1], 'Validation successful: YES (result: 0)')
 
     def test_schema_path(self):
-        output = subprocess.run([exe_path('pharmmltool'), 'validate', testfile_path('glucoseKinetics.xml'), '--schema-path=../schema/0.8.1'], stdout=subprocess.PIPE)
+        schema_path = '../schema/0.8.1'
+        if not os.path.exists(schema_path):
+            schema_path = 'schema/0.8.1'
+        output = subprocess.run([exe_path('pharmmltool'), 'validate', testfile_path('glucoseKinetics.xml'), '--schema-path=' + schema_path], stdout=subprocess.PIPE)
         l = output.stdout.decode('UTF-8').split("\n")
         self.assertEqual(l[1], 'Validation successful: YES (result: 0)')