diff options
author | Torbjörn Svensson | 2020-08-06 08:09:33 +0000 |
---|---|---|
committer | Jonah Graham | 2020-08-07 00:54:52 +0000 |
commit | 69acfe4819bcde20d20598ede0be1a6d33a560e3 (patch) | |
tree | 8b2bfe6a1f3907d27dad91fa8ae6037beee59c23 /native | |
parent | 2bd07a89caed5b9752ed595a09d870efe12005c1 (diff) | |
download | org.eclipse.cdt-69acfe4819bcde20d20598ede0be1a6d33a560e3.tar.gz org.eclipse.cdt-69acfe4819bcde20d20598ede0be1a6d33a560e3.tar.xz org.eclipse.cdt-69acfe4819bcde20d20598ede0be1a6d33a560e3.zip |
Bug 521515: Align directory name of native source code
The native directory can contain both libraries and utilities. In
Gerrit https://git.eclipse.org/r/c/cdt/org.eclipse.cdt/+/165270,
there is a utility, so the directory name "jni", or even "library" does
not work. In order to support both utilities and libraries, the
suggested name of the directory is "native_src" and thus, this commit
syncs that change in o.e.c.native.serial.
Change-Id: Iafa9ce9ae1dca7ef563ab397e8b3eb0b8642372d
Signed-off-by: Torbjörn Svensson <azoff@svenskalinuxforeningen.se>
Diffstat (limited to 'native')
-rw-r--r-- | native/org.eclipse.cdt.native.serial/build.properties | 2 | ||||
-rw-r--r-- | native/org.eclipse.cdt.native.serial/native_src/.gitignore (renamed from native/org.eclipse.cdt.native.serial/jni/.gitignore) | 0 | ||||
-rw-r--r-- | native/org.eclipse.cdt.native.serial/native_src/Makefile (renamed from native/org.eclipse.cdt.native.serial/jni/Makefile) | 0 | ||||
-rw-r--r-- | native/org.eclipse.cdt.native.serial/native_src/Readme.md (renamed from native/org.eclipse.cdt.native.serial/jni/Readme.md) | 0 | ||||
-rw-r--r-- | native/org.eclipse.cdt.native.serial/native_src/serial.c (renamed from native/org.eclipse.cdt.native.serial/jni/serial.c) | 0 | ||||
-rwxr-xr-x | native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll | bin | 381152 -> 381152 bytes | |||
-rw-r--r-- | native/org.eclipse.cdt.native.serial/pom.xml | 14 |
7 files changed, 8 insertions, 8 deletions
diff --git a/native/org.eclipse.cdt.native.serial/build.properties b/native/org.eclipse.cdt.native.serial/build.properties index 22cb27bb991..8d185293761 100644 --- a/native/org.eclipse.cdt.native.serial/build.properties +++ b/native/org.eclipse.cdt.native.serial/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ os/,\ about.html,\ cdt_logo_icon32.png -src.includes = jni/,\ +src.includes = native_src/,\ about.html diff --git a/native/org.eclipse.cdt.native.serial/jni/.gitignore b/native/org.eclipse.cdt.native.serial/native_src/.gitignore index 5761abcfdf0..5761abcfdf0 100644 --- a/native/org.eclipse.cdt.native.serial/jni/.gitignore +++ b/native/org.eclipse.cdt.native.serial/native_src/.gitignore diff --git a/native/org.eclipse.cdt.native.serial/jni/Makefile b/native/org.eclipse.cdt.native.serial/native_src/Makefile index 72c59e6e8ac..72c59e6e8ac 100644 --- a/native/org.eclipse.cdt.native.serial/jni/Makefile +++ b/native/org.eclipse.cdt.native.serial/native_src/Makefile diff --git a/native/org.eclipse.cdt.native.serial/jni/Readme.md b/native/org.eclipse.cdt.native.serial/native_src/Readme.md index 2413d2502f5..2413d2502f5 100644 --- a/native/org.eclipse.cdt.native.serial/jni/Readme.md +++ b/native/org.eclipse.cdt.native.serial/native_src/Readme.md diff --git a/native/org.eclipse.cdt.native.serial/jni/serial.c b/native/org.eclipse.cdt.native.serial/native_src/serial.c index bd77e74bffc..bd77e74bffc 100644 --- a/native/org.eclipse.cdt.native.serial/jni/serial.c +++ b/native/org.eclipse.cdt.native.serial/native_src/serial.c diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll Binary files differindex 2b1a6fab520..e88734adb7c 100755 --- a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll +++ b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/native/org.eclipse.cdt.native.serial/pom.xml index 38302debf3d..783bad37431 100644 --- a/native/org.eclipse.cdt.native.serial/pom.xml +++ b/native/org.eclipse.cdt.native.serial/pom.xml @@ -46,7 +46,7 @@ <phase>process-resources</phase> <configuration> <target> - <exec executable="make" newenvironment="false" failOnError="true" dir="./jni"> + <exec executable="make" newenvironment="false" failOnError="true" dir="./native_src"> <arg value="rebuild" /> </exec> </target> @@ -79,7 +79,7 @@ <configuration> <target> <exec executable="docker" newenvironment="false" failOnError="true"> - <!-- docker run -\-rm -t -v $(git rev-parse -\-show-toplevel):/work -w /work/$(git rev-parse -\-show-prefix) quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest make -C jni rebuild --> + <!-- docker run -\-rm -t -v $(git rev-parse -\-show-toplevel):/work -w /work/$(git rev-parse -\-show-prefix) quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest make -C native_src rebuild --> <arg value="run" /> <arg value="--rm" /> <arg value="-t" /> @@ -90,7 +90,7 @@ <arg value="quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest" /> <arg value="make" /> <arg value="-C" /> - <arg value="jni" /> + <arg value="native_src" /> <arg value="rebuild" /> </exec> </target> @@ -122,7 +122,7 @@ <phase>process-resources</phase> <configuration> <target> - <exec executable="make" newenvironment="false" dir="./jni"> + <exec executable="make" newenvironment="false" dir="./native_src"> <arg value="LIBS=../os/linux/x86_64/libserial.so" /> </exec> </target> @@ -136,7 +136,7 @@ <phase>clean</phase> <configuration> <target> - <exec executable="make" newenvironment="false" dir="./jni"> + <exec executable="make" newenvironment="false" dir="./native_src"> <arg value="LIBS=../os/linux/x86_64/libserial.so" /> <arg value="clean" /> </exec> @@ -169,7 +169,7 @@ <phase>process-resources</phase> <configuration> <target> - <exec executable="make" newenvironment="false" dir="./jni"> + <exec executable="make" newenvironment="false" dir="./native_src"> <arg value="LIBS=../os/linux/ppc64le/libserial.so" /> </exec> </target> @@ -183,7 +183,7 @@ <phase>clean</phase> <configuration> <target> - <exec executable="make" newenvironment="false" dir="./jni"> + <exec executable="make" newenvironment="false" dir="./native_src"> <arg value="LIBS=../os/linux/ppc64le/libserial.so" /> <arg value="clean" /> </exec> |