Skip to content

Commit 769a008

Browse files
khos2owyadvr
khos2ow
authored and
yadvr
committed
tools: Remove deprecated buildw and wix plugin (#2849)
Fixes #2771 This PR removes deprecated and obsolete wix plugin and corresponding buildw to build Windows related artifacts.
1 parent 1f9811d commit 769a008

14 files changed

Lines changed: 0 additions & 3610 deletions

File tree

‎client/pom.xml‎

Lines changed: 0 additions & 254 deletions
Original file line numberDiff line numberDiff line change
@@ -825,260 +825,6 @@
825825
</plugins>
826826
</build>
827827
</profile>
828-
<profile>
829-
<id>buildw</id>
830-
<activation>
831-
<property>
832-
<name>buildw</name>
833-
</property>
834-
</activation>
835-
<build>
836-
<plugins>
837-
<plugin>
838-
<artifactId>maven-antrun-plugin</artifactId>
839-
<executions>
840-
<execution>
841-
<id>generate-resource-windows</id>
842-
<phase>generate-resources</phase>
843-
<goals>
844-
<goal>run</goal>
845-
</goals>
846-
<configuration>
847-
<target>
848-
<copy todir="./target">
849-
<fileset dir="../scripts/installer/windows/">
850-
<include name="start.bat" />
851-
<include name="acs_license.rtf" />
852-
<include name="optionstheme.xml" />
853-
<include name="*.wxl" />
854-
</fileset>
855-
</copy>
856-
<copy todir="./target/client">
857-
<fileset dir="./target/generated-webapp">
858-
<include name="**/*" />
859-
</fileset>
860-
</copy>
861-
<copy todir="./target/setup">
862-
<fileset dir="./target/utilities/scripts/db">
863-
<include name="**/*" />
864-
</fileset>
865-
</copy>
866-
<copy file="../scripts/storage/secondary/cloud-install-sys-tmplt.py" tofile="target/scripts/cloud-install-sys-tmplt.py" />
867-
<copy todir="./target/scripts">
868-
<fileset dir="./target/utilities/bin">
869-
<include name="**/*" />
870-
</fileset>
871-
</copy>
872-
<copy todir="./target/python-site-packages">
873-
<fileset dir="../python/lib">
874-
<include name="**/*" />
875-
</fileset>
876-
</copy>
877-
</target>
878-
</configuration>
879-
</execution>
880-
<execution>
881-
<id>download-files</id>
882-
<phase>prepare-package</phase>
883-
<goals>
884-
<goal>run</goal>
885-
</goals>
886-
<configuration>
887-
<target>
888-
<!-- download file -->
889-
<get src="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi"
890-
dest="target"
891-
verbose="false"
892-
usetimestamp="true" />
893-
<get src="https://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi"
894-
dest="target"
895-
verbose="false"
896-
usetimestamp="true" />
897-
<get
898-
src="http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi"
899-
dest="target"
900-
verbose="false"
901-
usetimestamp="true" />
902-
<get
903-
src="http://downloads.sourceforge.net/project/cdrtoolswin/1.0/Binaries/CDR-Tools.exe?r=&amp;ts=1398764640&amp;use_mirror=kaz"
904-
dest="target"
905-
verbose="false"
906-
usetimestamp="true" />
907-
<get src="https://bootstrap.pypa.io/ez_setup.py"
908-
dest="target"
909-
verbose="false"
910-
usetimestamp="true" />
911-
</target>
912-
</configuration>
913-
</execution>
914-
</executions>
915-
</plugin>
916-
<plugin>
917-
<groupId>org.apache.maven.plugins</groupId>
918-
<artifactId>maven-war-plugin</artifactId>
919-
<version>2.5</version>
920-
<configuration>
921-
<webappDirectory>target/client</webappDirectory>
922-
<webXml>./target/generated-webapp/WEB-INF/web.xml</webXml>
923-
<warSourceDirectory>./target/generated-webapp</warSourceDirectory>
924-
<archive>
925-
<manifest>
926-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
927-
</manifest>
928-
<manifestEntries>
929-
<Implementation-Revision>${git.revision}</Implementation-Revision>
930-
<Implementation-Branch>${git.branch}</Implementation-Branch>
931-
</manifestEntries>
932-
</archive>
933-
</configuration>
934-
</plugin>
935-
<plugin>
936-
<groupId>org.apache.cloudstack</groupId>
937-
<artifactId>Wix-cloudstack-maven-plugin</artifactId>
938-
<version>${project.version}</version>
939-
<executions>
940-
<execution>
941-
<id>wix-cs</id>
942-
<configuration>
943-
<vars>-var wix.SourceClient</vars>
944-
<workingDirectory>${basedir}/target</workingDirectory>
945-
<dir>client</dir>
946-
<template>fragment</template>
947-
<directoryName>WEBAPPS</directoryName>
948-
<outputFile>target/client.wxs</outputFile>
949-
<componentGroup>ClientPath</componentGroup>
950-
</configuration>
951-
<goals>
952-
<goal>heat</goal>
953-
</goals>
954-
</execution>
955-
<execution>
956-
<id>wix-cs-setup-db</id>
957-
<configuration>
958-
<vars>-var wix.SetupPathDir</vars>
959-
<workingDirectory>${basedir}/target</workingDirectory>
960-
<dir>setup</dir>
961-
<template>fragment</template>
962-
<directoryName>CSMANAGEMENT</directoryName>
963-
<outputFile>target/setupdb.wxs</outputFile>
964-
<componentGroup>SetupPath</componentGroup>
965-
</configuration>
966-
<goals>
967-
<goal>heat</goal>
968-
</goals>
969-
</execution>
970-
<execution>
971-
<id>wix-cs-utilities</id>
972-
<configuration>
973-
<vars>-var wix.UtilitiesPathDir</vars>
974-
<workingDirectory>${basedir}/target</workingDirectory>
975-
<dir>scripts</dir>
976-
<template>fragment</template>
977-
<directoryName>INSTALLDIR</directoryName>
978-
<outputFile>target/utilities.wxs</outputFile>
979-
<componentGroup>UtilitiesPath</componentGroup>
980-
</configuration>
981-
<goals>
982-
<goal>heat</goal>
983-
</goals>
984-
</execution>
985-
<execution>
986-
<id>python-site-packages</id>
987-
<configuration>
988-
<vars>-var wix.PythonSitePackagesDir</vars>
989-
<workingDirectory>${basedir}/target</workingDirectory>
990-
<dir>python-site-packages</dir>
991-
<template>fragment</template>
992-
<directoryName>INSTALLDIR</directoryName>
993-
<outputFile>target/python-site-packages.wxs</outputFile>
994-
<componentGroup>PythonSitePackagesPath</componentGroup>
995-
</configuration>
996-
<goals>
997-
<goal>heat</goal>
998-
</goals>
999-
</execution>
1000-
</executions>
1001-
</plugin>
1002-
<plugin>
1003-
<groupId>org.bitbucket.joxley</groupId>
1004-
<artifactId>wix-maven-plugin</artifactId>
1005-
<version>1.1.1</version>
1006-
<executions>
1007-
<execution>
1008-
<id>wix-acs</id>
1009-
<configuration>
1010-
<workingDirectory>${basedir}/target</workingDirectory>
1011-
<extensions>
1012-
<extension>WixFirewallExtension</extension>
1013-
<extension>WixUIExtension</extension>
1014-
<extension>WixUtilExtension</extension>
1015-
</extensions>
1016-
<arguments>-dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages</arguments>
1017-
<sourceFiles>
1018-
<sourceFile>../scripts/installer/windows/acs.wxs</sourceFile>
1019-
<sourceFile>../scripts/installer/windows/WixInstallerDialog.wxs</sourceFile>
1020-
<sourceFile>../scripts/installer/windows/Setup_Databases.wxs</sourceFile>
1021-
<sourceFile>target/client.wxs</sourceFile>
1022-
<sourceFile>target/setupdb.wxs</sourceFile>
1023-
<sourceFile>target/utilities.wxs</sourceFile>
1024-
<sourceFile>target/python-site-packages.wxs</sourceFile>
1025-
</sourceFiles>
1026-
<outputDirectory>target</outputDirectory>
1027-
<objectFiles>
1028-
<objectFile>target/acs.wixobj</objectFile>
1029-
<objectFile>target/client.wixobj</objectFile>
1030-
<objectFile>target/setupdb.wixobj</objectFile>
1031-
<objectFile>target/utilities.wixobj</objectFile>
1032-
<objectFile>target/WixInstallerDialog.wixobj</objectFile>
1033-
<objectFile>target/Setup_Databases.wixobj</objectFile>
1034-
<objectFile>target/python-site-packages.wixobj</objectFile>
1035-
</objectFiles>
1036-
<cultures>
1037-
<culture>en-us</culture>
1038-
</cultures>
1039-
<localizationFiles>
1040-
<localizationFile>target/en-us.wxl</localizationFile>
1041-
</localizationFiles>
1042-
<outputFile>target/acs.msi</outputFile>
1043-
</configuration>
1044-
<goals>
1045-
<goal>candle</goal>
1046-
<goal>light</goal>
1047-
</goals>
1048-
</execution>
1049-
<execution>
1050-
<id>wix-final</id>
1051-
<configuration>
1052-
<workingDirectory>${basedir}/target</workingDirectory>
1053-
<extensions>
1054-
<extension>WixBalExtension</extension>
1055-
<extension>WixUtilExtension</extension>
1056-
</extensions>
1057-
<sourceFiles>
1058-
<sourceFile>../scripts/installer/windows/dependencies.wxs</sourceFile>
1059-
</sourceFiles>
1060-
<outputDirectory>target</outputDirectory>
1061-
<objectFiles>
1062-
<objectFile>target/dependencies.wixobj</objectFile>
1063-
</objectFiles>
1064-
<cultures>
1065-
<culture>en-US</culture>
1066-
</cultures>
1067-
<localizationFiles>
1068-
<localizationFile>target/en-us.wxl</localizationFile>
1069-
</localizationFiles>
1070-
<outputFile>target/acs-${project.version}.exe</outputFile>
1071-
</configuration>
1072-
<goals>
1073-
<goal>candle</goal>
1074-
<goal>light</goal>
1075-
</goals>
1076-
</execution>
1077-
</executions>
1078-
</plugin>
1079-
</plugins>
1080-
</build>
1081-
</profile>
1082828
<profile>
1083829
<id>simulator</id>
1084830
<activation>

‎pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,16 +1253,5 @@
12531253
</plugins>
12541254
</build>
12551255
</profile>
1256-
<profile>
1257-
<id>buildw</id>
1258-
<activation>
1259-
<property>
1260-
<name>buildw</name>
1261-
</property>
1262-
</activation>
1263-
<modules>
1264-
<module>tools/wix-cloudstack-maven-plugin</module>
1265-
</modules>
1266-
</profile>
12671256
</profiles>
12681257
</project>

‎scripts/installer/windows/Setup_Databases.wxs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)