Merge commit 'e9d0212c9f667c692d269d5ef21e7401dc3e91e8'
This commit is contained in:
commit
024a6b29f1
3 changed files with 4 additions and 1 deletions
|
|
@ -1,4 +1,5 @@
|
|||
def comparefiles(importedfile, currentfile, boolean ignorewhitespace = true) {
|
||||
echo "Comparing file: ${importedfile} with: ${currentfile} option: ${ignorewhitespace}"
|
||||
def wsparameter = "-w"
|
||||
if (!ignorewhitespace) {
|
||||
wsparameter = ""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
def comparefiles(importedjsonfile, currentjsonfile) {
|
||||
echo "Comparing file: ${importedjsonfile} with: ${currentjsonfile}"
|
||||
echo "Comparing json file: ${importedjsonfile} with: ${currentjsonfile}"
|
||||
if (isUnix()) {
|
||||
sh """
|
||||
which jq
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ class DebRootDefinition {
|
|||
String GIS_OPT_KERNEL
|
||||
String GIS_OPT_LOGIC
|
||||
String GIS_OPT_PRINTHEAD
|
||||
String GIS_OPT_BOOT
|
||||
|
||||
String USR_BIN
|
||||
String USR_LIB_ARCH
|
||||
|
|
@ -49,6 +50,7 @@ class DebRootDefinition {
|
|||
GIS_OPT_KERNEL = "${DEBPATH}/opt/gis/kernel" + inpackagepathsuffix
|
||||
GIS_OPT_LOGIC = "${DEBPATH}/opt/gis/logic" + inpackagepathsuffix
|
||||
GIS_OPT_PRINTHEAD = "${DEBPATH}/opt/gis/printhead" + inpackagepathsuffix
|
||||
GIS_OPT_BOOT = "${DEBPATH}/opt/gis/boot" + inpackagepathsuffix
|
||||
|
||||
USR_BIN = "${DEBPATH}/usr/bin" + inpackagepathsuffix
|
||||
USR_LIB_ARCH = "${DEBPATH}/usr/lib/arm-linux-gnueabihf" + inpackagepathsuffix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue