Merge branch 'master' of https://github.com/rticommunity/idl4-enterpr…

…ise-architect
rticommunity · Aug 6, 2016 · 7f9743c · 7f9743c
2 parents f38976d + a5a2b04
commit 7f9743c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/doc/Mapping_UML_to_IDL.docx b/doc/Mapping_UML_to_IDL.docx
diff --git a/doc/Mapping_UML_to_IDL.pdf b/doc/Mapping_UML_to_IDL.pdf
diff --git a/src/installbuilder.xml b/src/installbuilder.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>idl4eaextension</shortName>
     <fullName>IDL 4 Sparx Enterprise Architect Extension</fullName>
-    <version>1.5</version>
+    <version>1.6</version>
     <installerFilename>idl4_ea_extension-installer-${project.version}.${platform_exec_suffix}</installerFilename>
     <showFileUnpackingProgress>0</showFileUnpackingProgress>
     <removeLogFile>1</removeLogFile>
@@ -21,15 +21,36 @@
 	    <name>idl4_ea_extension</name>
 	    <folderList>
 		<folder>
+		    <name>root_dir</name>
 		    <description>installation_dir</description>
 		    <destination>${installdir}</destination>
 		    <distributionFileList>
 			<distributionFile>
 			    <origin>IDL4_EA_Extension/bin/Release/IDL4_EA_Extension.dll</origin>
 			</distributionFile>
+		    </distributionFileList>
+		</folder>
+                <folder>
+		    <name>examples</name>
+		    <description>installation_dir_examples</description>
+		    <destination>${installdir}/examples</destination>
+		    <distributionFileList>
 			<distributionFile>
 			    <origin>../uml_models/example/ExampleDataClasses.eap</origin>
 			</distributionFile>
+			<distributionFile>
+			    <origin>../doc/Mapping_UML_to_IDL_ExampleModel.eap</origin>
+			</distributionFile>			
+		    </distributionFileList>
+		</folder>
+		<folder>
+		    <name>doc</name>
+		    <description>installation_dir_doc</description>
+		    <destination>${installdir}/doc</destination>
+		    <distributionFileList>
+			<distributionFile>
+			    <origin>../doc/Mapping_UML_to_IDL.pdf</origin>
+			</distributionFile>
 		    </distributionFileList>
 		</folder>
 	    </folderList>
@@ -42,7 +63,7 @@
 		    <destination>${installdir}</destination>
 		    <distributionFileList>
 			<distributionFile>
-			    <origin>../redistributables/vcredist_2015_x86.exe</origin>
+			    <origin>../redistributables/vcredist_2013_x86.exe</origin>
 			</distributionFile>
 		    </distributionFileList>
                     <actionList>