You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/05/17 10:58:16 UTC
[iotdb] 01/02: Avoild using symlink when pack all-in-one package
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch refactor_all_in_one
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8eaf46b67c50c7af3d2d8eda9be95269ef78ab18
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue May 17 18:57:54 2022 +0800
Avoild using symlink when pack all-in-one package
---
distribution/pom.xml | 22 ----------
distribution/src/assembly/all.xml | 6 +--
distribution/src/assembly/cluster.xml | 81 -----------------------------------
3 files changed, 3 insertions(+), 106 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 327bb2e8b0..c9bd405b0d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -32,28 +32,6 @@
<modules/>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <target>
- <mkdir dir="target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode"/>
- <mkdir dir="target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode"/>
- <mkdir dir="target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/lib"/>
- <symlink link="${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode/lib" resource="../lib"/>
- <symlink link="${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode/lib" resource="../lib"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml
index fb48d282c0..f9bc0e9899 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -72,12 +72,12 @@
</fileSet>
<fileSet>
<outputDirectory>datanode/sbin</outputDirectory>
- <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/sbin</directory>
+ <directory>${maven.multiModuleProjectDirectory}/distribution/src/assembly/resources/datanode/sbin</directory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<outputDirectory>confignode/sbin</outputDirectory>
- <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/sbin</directory>
+ <directory>${maven.multiModuleProjectDirectory}/distribution/src/assembly/resources/confignode/sbin</directory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
@@ -87,7 +87,7 @@
</fileSet>
<fileSet>
<outputDirectory>datanode/sbin</outputDirectory>
- <directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/sbin</directory>
+ <directory>${maven.multiModuleProjectDirectory}/distribution/src/assembly/resources/cli/sbin</directory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
diff --git a/distribution/src/assembly/cluster.xml b/distribution/src/assembly/cluster.xml
deleted file mode 100644
index 7f5903cd94..0000000000
--- a/distribution/src/assembly/cluster.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<assembly>
- <id>cluster-bin</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <baseDirectory>apache-iotdb-${project.version}-cluster-bin</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:iotdb-cluster:zip:*</include>
- <include>*:iotdb-cli:zip:*</include>
- </includes>
- <outputDirectory>${file.separator}</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <!-- <fileSet>-->
- <!-- <directory>${maven.multiModuleProjectDirectory}/cluster/src/assembly/resources/conf</directory>-->
- <!-- <outputDirectory>conf</outputDirectory>-->
- <!-- </fileSet>-->
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/cluster/src/assembly/resources/sbin</directory>
- <outputDirectory>sbin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <!-- <fileSet>-->
- <!-- <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf</directory>-->
- <!-- <outputDirectory>conf</outputDirectory>-->
- <!-- </fileSet>-->
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/tools</directory>
- <outputDirectory>tools</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <!--end-->
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/sbin</directory>
- <outputDirectory>sbin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/tools</directory>
- <outputDirectory>tools</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/iotdb-env.sh</source>
- <destName>conf/iotdb-env.sh</destName>
- <fileMode>0755</fileMode>
- </file>
- </files>
- <componentDescriptors>
- <componentDescriptor>common-files.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>