From 9b76f5254f86cf191d0d40da0bed731084fb9c96 Mon Sep 17 00:00:00 2001 From: rrowlands Date: Thu, 7 Nov 2019 03:54:45 +0000 Subject: [PATCH] Manager libraries no longer required to be checked in. --- .gitignore | 14 ++++++++++++++ installer-stage/Installer.nsi | 4 ++-- patch/all-in-one-patch.nsi | 4 ++-- standalone/buildall.bat | 12 +++++++++--- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b660b0341..160784f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,17 @@ **/bin/** **/.DS_Store tomcat-remote-listener/dependency-reduced-pom.xml +standalone/backup-manager-1.0.0/lib/** +standalone/ddms-initializer-1.0.0/lib/** +standalone/geo-manager-1.0.0/lib/** +standalone/manager-1.0.0/lib/** +standalone/synch-manager-1.0.0/lib/** +installer-stage/ODKAggregate/** +installer-stage/webapp/** +build/installer.exe +build/patcher.exe +build/InstallDDMSblank-*.exe +build/patch-*.exe +DDMS/profiles/MDSS.properties +DDMS/profiles/MDSS-MALARIA.properties +DDMS/profiles/MDSS-DENGUE.properties \ No newline at end of file diff --git a/installer-stage/Installer.nsi b/installer-stage/Installer.nsi index 52b52be55..7c22a39d0 100644 --- a/installer-stage/Installer.nsi +++ b/installer-stage/Installer.nsi @@ -344,14 +344,14 @@ Section -Main SEC0000 SetOutPath $INSTDIR # These version numbers are automatically regexed by ant - StrCpy $PatchVersion 1572471296 + StrCpy $PatchVersion 1573090650 StrCpy $RootsVersion 1572381298 StrCpy $MenuVersion 1572381298 StrCpy $LocalizationVersion 1572381298 StrCpy $PermissionsVersion 1572381298 StrCpy $RunwayVersion 1572056769 StrCpy $IdVersion 7686 - StrCpy $ManagerVersion 1572471296 + StrCpy $ManagerVersion 1573090650 StrCpy $BirtVersion 1572056769 StrCpy $EclipseVersion 1572056769 StrCpy $WebappsVersion 1524675281 diff --git a/patch/all-in-one-patch.nsi b/patch/all-in-one-patch.nsi index 21dc22990..3c3e5bfd7 100644 --- a/patch/all-in-one-patch.nsi +++ b/patch/all-in-one-patch.nsi @@ -227,8 +227,8 @@ Section -Main SEC0000 # The version numbers are automatically replaced by all-in-one-patch.xml StrCpy $RunwayVersion 1572056769 StrCpy $MetadataVersion 7688 - StrCpy $ManagerVersion 1572471296 - StrCpy $PatchVersion 1572471296 + StrCpy $ManagerVersion 1573090650 + StrCpy $PatchVersion 1573090650 StrCpy $RootsVersion 1572381298 StrCpy $MenuVersion 1572381298 StrCpy $LocalizationVersion 1572381298 diff --git a/standalone/buildall.bat b/standalone/buildall.bat index fddbb2270..7455c79e7 100644 --- a/standalone/buildall.bat +++ b/standalone/buildall.bat @@ -18,12 +18,16 @@ if %errorlevel% neq 0 exit /b %errorlevel% call mvn -U -f ..\tomcat-remote-listener\pom.xml clean install if %errorlevel% neq 0 exit /b %errorlevel% -xcopy /y ..\tomcat-remote-listener\target\tomcat-remote-listener.jar C:\git\DDMS\standalone\manager-1.0.0\lib\tomcat-remote-listener-1.0.1.jar +call mvn -U -f ..\manager\pom.xml dependency:copy-dependencies -DoutputDirectory=C:\git\DDMS\standalone\manager-1.0.0\lib +if %errorlevel% neq 0 exit /b %errorlevel% +xcopy /y ..\tomcat-remote-listener\target\tomcat-remote-listener.jar C:\git\DDMS\standalone\manager-1.0.0\lib if %errorlevel% neq 0 exit /b %errorlevel% call mvn -U -f ..\manager\pom.xml clean install if %errorlevel% neq 0 exit /b %errorlevel% -xcopy /y ..\manager\target\manager-1.0.0.jar C:\git\DDMS\standalone\manager-1.0.0\lib\manager-1.0.0.jar +call mvn -U -f ..\manager\pom.xml dependency:copy-dependencies -DoutputDirectory=C:\git\DDMS\standalone\manager-1.0.0\lib +if %errorlevel% neq 0 exit /b %errorlevel% +xcopy /y ..\manager\target\manager-1.0.0.jar C:\git\DDMS\standalone\manager-1.0.0\lib if %errorlevel% neq 0 exit /b %errorlevel% cmd /c "%ANT_HOME%\bin\ant" -Dbasedir=..\ddms-initializer -buildfile ..\ddms-initializer\scripts\deploy.xml -Dmdss.admin=C:\git\DDMS\standalone -Dmdss.root=C:\git\DDMS\DDMS -Dswt.jar=C:\Users\Administrator\.m2\repository\org\eclipse\swt\org\eclipse\swt\win32\win32\x86_64\4\3\swt\org.eclipse.swt.win32.win32.x86_64\4.3\org.eclipse.swt.win32.win32.x86_64-4.3.jar deploy @@ -31,7 +35,9 @@ if %errorlevel% neq 0 exit /b %errorlevel% call mvn -U -f ..\backup-manager\pom.xml clean install if %errorlevel% neq 0 exit /b %errorlevel% -xcopy /y ..\backup-manager\target\backup-manager-1.0.0.jar C:\git\DDMS\standalone\backup-manager-1.0.0\lib\backup-manager-1.0.0.jar +call mvn -U -f ..\manager\pom.xml dependency:copy-dependencies -DoutputDirectory=C:\git\DDMS\standalone\backup-manager-1.0.0\lib +if %errorlevel% neq 0 exit /b %errorlevel% +xcopy /y ..\backup-manager\target\backup-manager-1.0.0.jar C:\git\DDMS\standalone\backup-manager-1.0.0\lib if %errorlevel% neq 0 exit /b %errorlevel% cmd /c "%ANT_HOME%\bin\ant" -Dbasedir=..\MDSSGISI -buildfile ..\MDSSGISI\scripts\deploy.xml -Dmdss.admin=C:\git\DDMS\standalone -Dmdss.root=C:\git\DDMS\DDMS -Dswt.jar=C:\Users\Administrator\.m2\repository\org\eclipse\swt\org\eclipse\swt\win32\win32\x86_64\4\3\swt\org.eclipse.swt.win32.win32.x86_64\4.3\org.eclipse.swt.win32.win32.x86_64-4.3.jar deploy