diff --git a/compile/compile.groovy b/compile/compile.groovy index d5508f9..a00ffb5 100644 --- a/compile/compile.groovy +++ b/compile/compile.groovy @@ -24,13 +24,11 @@ pipeline { stage('Checkout source') { steps { script { - SOURCEURL = 'git@hydra:gis/atlasservices.git' + SOURCEURL = 'git@hydra:core-presto/pc-utilities/local-network-package-updater.git' SOURCEREVISION = "${SOURCE_REVISION}" - SOURCEDIR = "${WORKSPACE}\\atlasservices" - configurationhelper.gitCheckoutAndRegister(meta, 'atlasservices', SOURCEURL, SOURCEREVISION, SOURCEDIR, '', 0, false) + SOURCEDIR = "${WORKSPACE}\\lnpu" + configurationhelper.gitCheckoutAndRegister(meta, 'lnpu', SOURCEURL, SOURCEREVISION, SOURCEDIR, '', 0, false) env.SOURCE_PATH = SOURCEDIR - env.JOBSCRIPTS = "${SOURCE_PATH}\\autobuild\\build" - env.JOBSCRIPTS_COMMON = "${SOURCE_PATH}\\autobuild\\common" env.SRC = "${SOURCE_PATH}/src" } } @@ -39,11 +37,8 @@ pipeline { steps { script { env.BUILDOUTPUT = "${WORKSPACE}/build" - env.PS_WHOLE_ARTIFACTS_ROOT = "${WORKSPACE}/ps_whole" - env.PSBIN = "${WORKSPACE}/ps_bin" cleanfolders = [ BUILDOUTPUT, - "${WORKSPACE}/SharedPackages", ] cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") cleaner.clean(cleanfolders) @@ -58,32 +53,6 @@ pipeline { } } } - stage('Import Print server to adjust version number') { - steps { - script { - importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - - // Alter the version number - def pswholeimportoptions = importer.getNewImportOptions() - pswholeimportoptions.source(PRINT_SERVER_ARTIFACT_LOCATION, - PRINT_SERVER_BUILD_JOB, - PRINT_SERVER_BUILD_SELECTOR, - PRINT_SERVER_RELEASE_REPO, - PRINT_SERVER_RELEASE_REVISION) - pswholeimportoptions.setfilter('meta/**') - pswholeimportoptions.setincrementversionnumber(false) - pswholeimportoptions.setappendtoparentmeta(false) - pswholemeta = importer.artifactimport(meta, pswholeimportoptions, PS_WHOLE_ARTIFACTS_ROOT) - - // Import the binaries from the related component - def psbinimportoptions = importer.getNewImportOptions() - psbinimportoptions.setsourceselect(PRINT_SERVER_ARTIFACT_LOCATION) - psbinimportoptions.setfilter('meta/**,bin/x64/Release/Engine - Render.dll,bin/x64/Release/Engine - Render.lib,bin/x64/Release/Engine - Render.pdb,bin/x64/Release/TBarCode11_x64.dll,bin/x64/Release/GIS Utility - Toolbox.dll,bin/x64/Release/GIS Utility - Toolbox.lib,bin/x64/Release/GIS Utility - Toolbox.pdb,bin/x64/Release/zlib1.dll,bin/x64/Release/zlib1.lib,bin/x64/Release/zlib1.pdb,bin/x64/Release/GIS Utility - TCP-IP Comms.dll,bin/x64/Release/GIS Utility - TCP-IP Comms.lib,bin/x64/Release/GIS Utility - TCP-IP Comms.pdb,bin/x64/Release/Dialog - Tree Node Editor.dll,bin/x64/Release/Dialog - Tree Node Editor.lib,bin/x64/Release/Dialog - Tree Node Editor.pdb') - psbinimportoptions.setincrementversionnumber(false) - psbinmeta = importer.artifactimport(meta, pswholemeta, PS_WHOLE_ARTIFACTS_ROOT, 'PRINT_SERVER', 'CORE_BINARIES', psbinimportoptions, PSBIN) - } - } - } stage('Version stamp files') { steps { script { @@ -107,16 +76,6 @@ pipeline { } } } - stage('Prepare exports') { - steps { - script { - bat """ - xcopy /i /e "${SRC}\\PackageSpecs\\*.nupkg" "${WORKSPACE}\\SharedPackages" - if errorlevel 1 exit /b 1 - """ - } - } - } stage('Static analysis') { steps { script { @@ -149,7 +108,7 @@ pipeline { stage('Archiving artifacts') { steps { script { - def artifactlist = meta.generateartifacts(['build/**','SharedPackages/**']) + def artifactlist = meta.generateartifacts(['build/**']) artifactarchiver = load("${autobuilder.commonscripts()}/artifacts/archiver.groovy") artifactarchiver.archive(meta, artifactlist) }