#43: integrated documentation (#52)

* #43: integrated documentation * #43: integrated documentation * #44: fixed (submodule update) * #21: restructure windows extensions * #44: fixed CI frieldly settings * #44: fixed (submodule update)
devonfw · Mar 28, 2019 · ae75446 · ae75446
1 parent 57454f6
commit ae75446
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 35 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "doc"]
+	path = doc
+	url = https://github.com/devonfw/devon-ide.wiki.git
+	branch = master
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+-Drevision=3.0.0-beta3
diff --git a/configurator/pom.xml b/configurator/pom.xml
@@ -11,7 +11,7 @@
   <groupId>com.devonfw.tools.ide</groupId>
   <artifactId>devon-ide-configurator</artifactId>
   <packaging>jar</packaging>
-  <version>${devon_ide_version}</version>
+  <version>${revision}${changelist}</version>
   <name>${project.artifactId}</name>
   <description>Code for configurator the creates or updates configuration of IDEs (Eclipse, etc.).</description>
 

diff --git a/doc b/doc
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,8 @@
   <inceptionYear>2013</inceptionYear>
 
   <properties>
-    <devon_ide_version>3.0.0-beta3-SNAPSHOT</devon_ide_version>
+    <revision>dev</revision>
+    <changelist>-SNAPSHOT</changelist>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -27,6 +28,7 @@
   </dependencies>
 
   <modules>
+    <module>doc</module>
     <module>configurator</module>
     <module>scripts</module>
     <module>settings</module>

diff --git a/scripts/pom.xml b/scripts/pom.xml
@@ -11,7 +11,7 @@
   <groupId>com.devonfw.tools.ide</groupId>
   <artifactId>devon-ide-scripts</artifactId>
   <packaging>pom</packaging>
-  <version>${devon_ide_version}</version>
+  <version>${revision}${changelist}</version>
   <name>${project.artifactId}</name>
   <description>Scripts to setup and update the development environment.</description>
 
@@ -73,45 +73,30 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-sources</id>
+            <id>copy-doc</id>
             <phase>package</phase>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>copy</goal>
             </goals>
             <configuration>
-              <includeScope>compile</includeScope>
-              <classifier>sources</classifier>
-              <outputDirectory>${project.build.outputDirectory}/scripts/licenses/sourcecode</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>devon-ide-doc</artifactId>
+                  <version>${project.version}</version>
+                  <type>pdf</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                  <destFileName>devon-ide-doc.pdf</destFileName>
+                </artifactItem>
+              </artifactItems>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>false</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>license-maven-plugin</artifactId>
-        <configuration>
-          <licensesOutputDirectory>${project.build.outputDirectory}/scripts/licenses</licensesOutputDirectory>
-          <outputDirectory>${project.build.outputDirectory}/scripts/licenses</outputDirectory>
-          <acceptPomPackaging>true</acceptPomPackaging>
-          <includedScopes>compile,runtime</includedScopes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>download-licenses</id>
-            <phase>package</phase>
-            <goals>
-              <goal>download-licenses</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>add-third-party</id>
-            <phase>package</phase>
-            <goals>
-              <goal>add-third-party</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

diff --git a/...ources/system/windows/explorer/IDEenv.reg → ...n/resources/system/windows/cmd/IDEenv.reg b/...ources/system/windows/explorer/IDEenv.reg → ...n/resources/system/windows/cmd/IDEenv.reg
diff --git a/...urces/system/windows/explorer/install.bat → .../resources/system/windows/cmd/install.bat b/...urces/system/windows/explorer/install.bat → .../resources/system/windows/cmd/install.bat
diff --git a/...ources/system/windows/explorer/readme.txt → ...n/resources/system/windows/cmd/readme.txt b/...ources/system/windows/explorer/readme.txt → ...n/resources/system/windows/cmd/readme.txt
diff --git a/settings/pom.xml b/settings/pom.xml
@@ -11,7 +11,7 @@
   <groupId>com.devonfw.tools.ide</groupId>
   <artifactId>devon-ide-settings</artifactId>
   <packaging>pom</packaging>
-  <version>${devon_ide_version}</version>
+  <version>${revision}${changelist}</version>
   <name>${project.artifactId}</name>
   <description>Settings with configuration templates for devon-ide. You are supposed to copy and commit them to your version control system.</description>