Skip to content

Commit 5c6b922

Browse files
nachawatinachawati
committed
Update build path
1 parent 94b3d19 commit 5c6b922

File tree

25 files changed

+209
-97
lines changed

25 files changed

+209
-97
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,10 @@ A clean build of **Unity DGMS** is performed in two steps:
315315
./mvnw install
316316
```
317317
318-
This will build a binary distribution of **Unity DGMS** with all core dependencies inside the ``./target/unity/linux-gcc-amd64`` folder. You can test the build by running:
318+
This will build a binary distribution of **Unity DGMS** with all core dependencies inside the ``./target/linux-gcc-amd64`` folder. You can test the build by running:
319319
320320
```bash
321-
cd ./target/unity/linux-gcc-amd64
321+
cd ./target/linux-gcc-amd64
322322
java -Xrs -Xms1024m -jar ./lib/unity-cli-<VERSION>.jar run 1+1
323323
```
324324

‎cli/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<goal>copy-dependencies</goal>
4141
</goals>
4242
<configuration>
43-
<outputDirectory>${project.basedir}/../target/unity/${target}/lib</outputDirectory>
43+
<outputDirectory>${project.basedir}/../target/${target}/lib</outputDirectory>
4444
<silent>true</silent>
4545
</configuration>
4646
</execution>
@@ -61,7 +61,7 @@
6161
<mainClass>unity.cli.Main</mainClass>
6262
</manifest>
6363
</archive>
64-
<outputDirectory>${project.basedir}/../target/unity/${target}/lib</outputDirectory>
64+
<outputDirectory>${project.basedir}/../target/${target}/lib</outputDirectory>
6565
</configuration>
6666
</plugin>
6767

‎deploy/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<goal>copy-resources</goal>
4343
</goals>
4444
<configuration>
45-
<outputDirectory>${project.basedir}/../target/unity/${target}</outputDirectory>
45+
<outputDirectory>${project.basedir}/../target/${target}</outputDirectory>
4646
<overwrite>true</overwrite>
4747
<resources>
4848
<resource>
@@ -134,7 +134,7 @@
134134
<artifactId>dockerfile-maven-plugin</artifactId>
135135
<version>${dockerfile-maven-plugin.version}</version>
136136
<configuration>
137-
<contextDirectory>${project.basedir}/../target/unity/${target}</contextDirectory>
137+
<contextDirectory>${project.basedir}/../target/${target}</contextDirectory>
138138
<repository>dgms/dgms</repository>
139139
<tag>${project.version}</tag>
140140
</configuration>

‎docs/developer/build.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ A clean build of **Unity DGMS** is performed in two steps:
1616
./mvnw install
1717
1818
This will build a binary distribution of **Unity DGMS** with all core
19-
dependencies inside the ``./target/unity/linux-gcc-amd64`` folder. You
19+
dependencies inside the ``./target/linux-gcc-amd64`` folder. You
2020
can test the build by running:
2121

2222
.. code:: bash
2323
24-
cd ./target/unity/linux-gcc-amd64
24+
cd ./target/linux-gcc-amd64
2525
java -Xrs -Xms1024m -jar ./lib/unity-cli-<VERSION>.jar run 1+1

‎docs/html/_sources/developer/build.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ A clean build of **Unity DGMS** is performed in two steps:
1616
./mvnw install
1717
1818
This will build a binary distribution of **Unity DGMS** with all core
19-
dependencies inside the ``./target/unity/linux-gcc-amd64`` folder. You
19+
dependencies inside the ``./target/linux-gcc-amd64`` folder. You
2020
can test the build by running:
2121

2222
.. code:: bash
2323
24-
cd ./target/unity/linux-gcc-amd64
24+
cd ./target/linux-gcc-amd64
2525
java -Xrs -Xms1024m -jar ./lib/unity-cli-<VERSION>.jar run 1+1

‎docs/html/developer/build.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ <h1>Build from source<a class="headerlink" href="#build-from-source" title="Perm
178178
</pre></div>
179179
</div>
180180
<p>This will build a binary distribution of <strong>Unity DGMS</strong> with all core
181-
dependencies inside the <code class="docutils literal notranslate"><span class="pre">./target/unity/linux-gcc-amd64</span></code> folder. You
181+
dependencies inside the <code class="docutils literal notranslate"><span class="pre">./target/linux-gcc-amd64</span></code> folder. You
182182
can test the build by running:</p>
183183
<div class="code bash highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">./</span><span class="n">target</span><span class="o">/</span><span class="n">unity</span><span class="o">/</span><span class="n">linux</span><span class="o">-</span><span class="n">gcc</span><span class="o">-</span><span class="n">amd64</span>
184184
<span class="n">java</span> <span class="o">-</span><span class="n">Xrs</span> <span class="o">-</span><span class="n">Xms1024m</span> <span class="o">-</span><span class="n">jar</span> <span class="o">./</span><span class="n">lib</span><span class="o">/</span><span class="n">unity</span><span class="o">-</span><span class="n">cli</span><span class="o">-&lt;</span><span class="n">VERSION</span><span class="o">&gt;.</span><span class="n">jar</span> <span class="n">run</span> <span class="mi">1</span><span class="o">+</span><span class="mi">1</span>

‎kernel/pom.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<goal>copy-resources</goal>
102102
</goals>
103103
<configuration>
104-
<outputDirectory>${project.basedir}/../target/unity/${target}/kernels</outputDirectory>
104+
<outputDirectory>${project.basedir}/../target/${target}/kernels</outputDirectory>
105105
<overwrite>true</overwrite>
106106
<resources>
107107
<resource>
@@ -119,7 +119,7 @@
119119
<goal>copy-resources</goal>
120120
</goals>
121121
<configuration>
122-
<outputDirectory>${project.basedir}/../target/unity/${target}/include</outputDirectory>
122+
<outputDirectory>${project.basedir}/../target/${target}/include</outputDirectory>
123123
<resources>
124124
<resource>
125125
<directory>${project.basedir}/src/main/include</directory>
@@ -147,7 +147,7 @@
147147
<goal>copy-dependencies</goal>
148148
</goals>
149149
<configuration>
150-
<outputDirectory>${project.basedir}/../target/unity/${target}/lib</outputDirectory>
150+
<outputDirectory>${project.basedir}/../target/${target}/lib</outputDirectory>
151151
<silent>true</silent>
152152
</configuration>
153153
</execution>
@@ -168,7 +168,7 @@
168168
<mainClass>unity.kernel.DocumentationGenerator</mainClass>
169169
</manifest>
170170
</archive>
171-
<outputDirectory>${project.basedir}/../target/unity/${target}/lib</outputDirectory>
171+
<outputDirectory>${project.basedir}/../target/${target}/lib</outputDirectory>
172172
</configuration>
173173
</plugin>
174174

@@ -199,7 +199,7 @@
199199
</exec>
200200
<copy
201201
file="${project.build.directory}/${target}/unity-kernel/libunity-kernel.so"
202-
tofile="${project.basedir}/../target/unity/${target}/lib/libunity-kernel.so"
202+
tofile="${project.basedir}/../target/${target}/lib/libunity-kernel.so"
203203
overwrite="true" />
204204
</target>
205205
</configuration>
@@ -317,7 +317,7 @@
317317
resource="net/sf/antcontrib/antcontrib.properties"
318318
classpathref="maven.plugin.classpath" />
319319
<available
320-
file="${project.basedir}/../target/unity/${target}/lib/libzorba_simplestore.so"
320+
file="${project.basedir}/../target/${target}/lib/libzorba_simplestore.so"
321321
property="CompileZorba" value="false" />
322322
<if>
323323
<equals arg1="${CompileZorba}" arg2="false" />
@@ -342,7 +342,7 @@
342342
<arg value="-DCMAKE_CXX_STANDARD_REQUIRED=ON" />
343343
<arg value="-DCMAKE_CXX_EXTENSIONS=OFF" />
344344
<arg
345-
value="-DCMAKE_INSTALL_PREFIX=${project.basedir}/../target/unity/${target}" />
345+
value="-DCMAKE_INSTALL_PREFIX=${project.basedir}/../target/${target}" />
346346
<arg
347347
value="-DCMAKE_INSTALL_RPATH=\$ORIGIN/" />
348348
<arg
@@ -356,14 +356,14 @@
356356
dir="${project.build.directory}/zorba-${zorba.version}/build/${target}">
357357
<arg value="install" />
358358
</exec>
359-
<copy file="/usr/lib/x86_64-linux-gnu/libicuuc.so.57" todir="${project.basedir}/../target/unity/${target}/lib"/>
360-
<chmod file="${project.basedir}/../target/unity/${target}/lib/libicuuc.so.57" perm="+x"/>
361-
<copy file="/usr/lib/x86_64-linux-gnu/libicudata.so.57" todir="${project.basedir}/../target/unity/${target}/lib"/>
362-
<chmod file="${project.basedir}/../target/unity/${target}/lib/libicudata.so.57" perm="+x"/>
363-
<copy file="/usr/lib/x86_64-linux-gnu/libicui18n.so.57" todir="${project.basedir}/../target/unity/${target}/lib"/>
364-
<chmod file="${project.basedir}/../target/unity/${target}/lib/libicui18n.so.57" perm="+x"/>
365-
<copy file="/usr/lib/x86_64-linux-gnu/libxerces-c-3.1.so" todir="${project.basedir}/../target/unity/${target}/lib"/>
366-
<chmod file="${project.basedir}/../target/unity/${target}/lib/libxerces-c-3.1.so" perm="+x"/>
359+
<copy file="/usr/lib/x86_64-linux-gnu/libicuuc.so.57" todir="${project.basedir}/../target/${target}/lib"/>
360+
<chmod file="${project.basedir}/../target/${target}/lib/libicuuc.so.57" perm="+x"/>
361+
<copy file="/usr/lib/x86_64-linux-gnu/libicudata.so.57" todir="${project.basedir}/../target/${target}/lib"/>
362+
<chmod file="${project.basedir}/../target/${target}/lib/libicudata.so.57" perm="+x"/>
363+
<copy file="/usr/lib/x86_64-linux-gnu/libicui18n.so.57" todir="${project.basedir}/../target/${target}/lib"/>
364+
<chmod file="${project.basedir}/../target/${target}/lib/libicui18n.so.57" perm="+x"/>
365+
<copy file="/usr/lib/x86_64-linux-gnu/libxerces-c-3.1.so" todir="${project.basedir}/../target/${target}/lib"/>
366+
<chmod file="${project.basedir}/../target/${target}/lib/libxerces-c-3.1.so" perm="+x"/>
367367
</else>
368368
</if>
369369
</target>
@@ -379,7 +379,7 @@
379379
resource="net/sf/antcontrib/antcontrib.properties"
380380
classpathref="maven.plugin.classpath" />
381381
<available
382-
file="${project.basedir}/../target/unity/${target}/bin/couenne"
382+
file="${project.basedir}/../target/${target}/bin/couenne"
383383
property="CompileCouenne" value="false" />
384384
<if>
385385
<equals arg1="${CompileCouenne}" arg2="false" />
@@ -412,7 +412,7 @@
412412
<arg value="get.dependencies.sh" />
413413
<arg value="build" />
414414
<arg
415-
value="--prefix=${project.basedir}/../target/unity/${target}" />
415+
value="--prefix=${project.basedir}/../target/${target}" />
416416
</exec>
417417
<exec executable="make" failonerror="true"
418418
dir="${project.build.directory}/Couenne-${couenne.version}/build/Couenne">
@@ -462,7 +462,7 @@
462462
<goal>install-file</goal>
463463
</goals>
464464
<configuration>
465-
<file>${project.basedir}/../target/unity/${target}/share/java/zorba_api.jar</file>
465+
<file>${project.basedir}/../target/${target}/share/java/zorba_api.jar</file>
466466
<groupId>io.zorba</groupId>
467467
<artifactId>zorba-api</artifactId>
468468
<version>${zorba.version}</version>

‎kernel/src/main/c++/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "unity-kernel")
3939
if (linux-gcc-amd64)
4040
include_directories(
4141
"${CMAKE_SOURCE_DIR}/../include"
42-
"${CMAKE_SOURCE_DIR}/../../../../target/unity/linux-gcc-amd64/include"
42+
"${CMAKE_SOURCE_DIR}/../../../../target/linux-gcc-amd64/include"
4343
"${JAVA_INCLUDE_PATH}"
4444
"${JAVA_INCLUDE_PATH2}"
4545
"${PYTHON_INCLUDE_DIRS}")
4646
target_link_libraries(${PROJECT_NAME} PRIVATE
4747
"${PYTHON_LIBRARIES}"
48-
"${CMAKE_SOURCE_DIR}/../../../../target/unity/linux-gcc-amd64/lib/libzorba_simplestore.so")
48+
"${CMAKE_SOURCE_DIR}/../../../../target/linux-gcc-amd64/lib/libzorba_simplestore.so")
4949
endif()

‎kernel/src/main/java/unity/kernel/engine/UnityAnalyticsEngineManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public static Path getInstallPath()
225225
switch (SystemUtils.OS_ARCH) {
226226
case "amd64":
227227
case "x86_64":
228-
return new File(location, "target/unity/linux-gcc-amd64").toPath();
228+
return new File(location, "target/linux-gcc-amd64").toPath();
229229
}
230230
}
231231
return new File(path).getParentFile().getParentFile().toPath();

‎modules/analytics/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<goal>copy-resources</goal>
4141
</goals>
4242
<configuration>
43-
<outputDirectory>${project.basedir}/../../target/unity/${target}/lib</outputDirectory>
43+
<outputDirectory>${project.basedir}/../../target/${target}/lib</outputDirectory>
4444
<resources>
4545
<resource>
4646
<directory>${project.basedir}/src/main/jsoniq</directory>
@@ -56,7 +56,7 @@
5656
<goal>copy-resources</goal>
5757
</goals>
5858
<configuration>
59-
<outputDirectory>${project.basedir}/../../target/unity/${target}/lib/python</outputDirectory>
59+
<outputDirectory>${project.basedir}/../../target/${target}/lib/python</outputDirectory>
6060
<resources>
6161
<resource>
6262
<directory>${project.basedir}/src/main/python</directory>
@@ -86,14 +86,14 @@
8686
<argument>-Xrs</argument>
8787
<argument>-Xms1024m</argument>
8888
<argument>-jar</argument>
89-
<argument>${project.basedir}/../../target/unity/linux-gcc-amd64/lib/unity-kernel-${project.version}.jar</argument>
89+
<argument>${project.basedir}/../../target/linux-gcc-amd64/lib/unity-kernel-${project.version}.jar</argument>
9090
<argument>${project.basedir}/../../docs/library/analytics.rst</argument>
9191
<argument>http://dgms.io/modules/analytics</argument>
92-
<argument>${project.basedir}/../../target/unity/linux-gcc-amd64/lib</argument>
92+
<argument>${project.basedir}/../../target/linux-gcc-amd64/lib</argument>
9393
</arguments>
9494
<environmentVariables>
95-
<DGMS_HOME>${project.basedir}/../../target/unity/linux-gcc-amd64</DGMS_HOME>
96-
<LD_LIBRARY_PATH>${project.basedir}/../../target/unity/linux-gcc-amd64/lib</LD_LIBRARY_PATH>
95+
<DGMS_HOME>${project.basedir}/../../target/linux-gcc-amd64</DGMS_HOME>
96+
<LD_LIBRARY_PATH>${project.basedir}/../../target/linux-gcc-amd64/lib</LD_LIBRARY_PATH>
9797
</environmentVariables>
9898
</configuration>
9999
</execution>

0 commit comments

Comments
 (0)