summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Herlant <aerostitch@users.noreply.github.com>2018-05-24 06:01:16 -0700
committerjkoan <jkoan@users.noreply.github.com>2018-05-24 15:01:16 +0200
commit2523dd28f42214ddf83367873b3163225045df3c (patch)
tree526972dcff39caca70d887bf3184f8796e2accba
parent01f62133c96e24b8b7df516007d7ef62af3a5759 (diff)
downloadnavit-2523dd28f42214ddf83367873b3163225045df3c.tar.gz
change:ci:rename ci folder to scripts (#593)
-rw-r--r--.circleci/config.yml32
-rw-r--r--scripts/basic_upload_apks.py (renamed from ci/basic_upload_apks.py)0
-rw-r--r--scripts/build.sh (renamed from ci/build.sh)0
-rw-r--r--scripts/build_android.sh (renamed from ci/build_android.sh)0
-rw-r--r--scripts/build_android_x86.sh (renamed from ci/build_android_x86.sh)0
-rw-r--r--scripts/build_linux.sh (renamed from ci/build_linux.sh)0
-rw-r--r--scripts/build_tomtom_minimal.sh (renamed from ci/build_tomtom_minimal.sh)0
-rw-r--r--scripts/build_tomtom_plugin.sh (renamed from ci/build_tomtom_plugin.sh)0
-rw-r--r--scripts/build_win32.sh (renamed from ci/build_win32.sh)0
-rw-r--r--scripts/build_wince.sh (renamed from ci/build_wince.sh)0
-rw-r--r--scripts/dbus_tests.py (renamed from ci/dbus_tests.py)0
-rw-r--r--scripts/docker/tomtom/Dockerfile (renamed from ci/docker/tomtom/Dockerfile)0
-rw-r--r--scripts/docker/tomtom/README.md (renamed from ci/docker/tomtom/README.md)0
-rw-r--r--scripts/docker/tomtom/entrypoint.sh (renamed from ci/docker/tomtom/entrypoint.sh)2
-rw-r--r--scripts/docker/tomtom/tomtom.cache (renamed from ci/docker/tomtom/tomtom.cache)0
-rw-r--r--scripts/generate_contributors.sh (renamed from ci/generate_contributors.sh)0
-rw-r--r--scripts/import_translations.sh (renamed from ci/import_translations.sh)0
-rw-r--r--scripts/merge_i18n_update.sh (renamed from ci/merge_i18n_update.sh)0
-rw-r--r--scripts/pointer-64.png (renamed from ci/pointer-64.png)bin1733 -> 1733 bytes
-rw-r--r--scripts/publish.sh (renamed from ci/publish.sh)4
-rw-r--r--scripts/run_linux_tests.sh (renamed from ci/run_linux_tests.sh)4
-rw-r--r--scripts/setup_android.sh (renamed from ci/setup_android.sh)0
-rw-r--r--scripts/setup_common_requirements.sh (renamed from ci/setup_common_requirements.sh)0
-rw-r--r--scripts/setup_tomtom_requirements.sh (renamed from ci/setup_tomtom_requirements.sh)0
-rw-r--r--scripts/setup_wince.sh (renamed from ci/setup_wince.sh)0
-rw-r--r--scripts/update_download_center.sh (renamed from ci/update_download_center.sh)0
-rw-r--r--scripts/update_doxygen.sh (renamed from ci/update_doxygen.sh)0
-rw-r--r--scripts/xdotools.sh (renamed from ci/xdotools.sh)2
28 files changed, 22 insertions, 22 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb190d8e5..af3daeb79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,17 +13,17 @@ jobs:
- run:
name: Setup requirements
command: |
- bash ci/setup_common_requirements.sh
+ bash scripts/setup_common_requirements.sh
apt-get install -y libpng12-dev libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl
- run:
name: Build for Linux
- command: bash ci/build_linux.sh
+ command: bash scripts/build_linux.sh
- store_artifacts:
path: linux/_CPack_Packages
- run:
name: Update Navit-Download-Center
command: |
- bash ci/update_download_center.sh
+ bash scripts/update_download_center.sh
run_doxygen:
<<: *defaults
steps:
@@ -36,7 +36,7 @@ jobs:
command: cd navit && doxygen
- run:
name: Update results to Github
- command: bash ci/update_doxygen.sh
+ command: bash scripts/update_doxygen.sh
- store_artifacts:
path: /root/project/doc
build_android:
@@ -130,14 +130,14 @@ jobs:
- run:
name: Build for Windows
command: |
- bash ci/setup_common_requirements.sh
- bash ci/build_win32.sh
+ bash scripts/setup_common_requirements.sh
+ bash scripts/build_win32.sh
- store_artifacts:
path: win32/navit.exe
- run:
name: Update Navit-Download-Center
command: |
- bash ci/update_download_center.sh
+ bash scripts/update_download_center.sh
build_wince:
docker:
- image: navit/dockerfiles:wince
@@ -146,16 +146,16 @@ jobs:
- run:
name: Prepare the WinCE build environment
command: |
- bash ci/setup_wince.sh
+ bash scripts/setup_wince.sh
- run:
name: Build for Windows CE
- command: bash ci/build_wince.sh
+ command: bash scripts/build_wince.sh
- store_artifacts:
path: wince/output
- run:
name: Update Navit-Download-Center
command: |
- bash ci/update_download_center.sh
+ bash scripts/update_download_center.sh
build_tomtom_minimal:
<<: *defaults
docker:
@@ -165,17 +165,17 @@ jobs:
- run:
name: Setup common requirements
command: |
- bash ci/setup_common_requirements.sh
+ bash scripts/setup_common_requirements.sh
- run:
name: Build for Tomtom (minimal)
command: |
- bash ci/build_tomtom_minimal.sh
+ bash scripts/build_tomtom_minimal.sh
- store_artifacts:
path: /output
- run:
name: Update Navit-Download-Center
command: |
- bash ci/update_download_center.sh
+ bash scripts/update_download_center.sh
build_tomtom_plugin:
<<: *defaults
docker:
@@ -185,17 +185,17 @@ jobs:
- run:
name: Setup common requirements
command: |
- bash ci/setup_common_requirements.sh
+ bash scripts/setup_common_requirements.sh
- run:
name: Build for Tomtom (plugin)
command: |
- bash ci/build_tomtom_plugin.sh
+ bash scripts/build_tomtom_plugin.sh
- store_artifacts:
path: /output
- run:
name: Update Navit-Download-Center
command: |
- bash ci/update_download_center.sh
+ bash scripts/update_download_center.sh
merge_trunk_in_master:
<<: *defaults
steps:
diff --git a/ci/basic_upload_apks.py b/scripts/basic_upload_apks.py
index b4b439536..b4b439536 100644
--- a/ci/basic_upload_apks.py
+++ b/scripts/basic_upload_apks.py
diff --git a/ci/build.sh b/scripts/build.sh
index 536ab7781..536ab7781 100644
--- a/ci/build.sh
+++ b/scripts/build.sh
diff --git a/ci/build_android.sh b/scripts/build_android.sh
index bf992fd2c..bf992fd2c 100644
--- a/ci/build_android.sh
+++ b/scripts/build_android.sh
diff --git a/ci/build_android_x86.sh b/scripts/build_android_x86.sh
index 6e84bc4e1..6e84bc4e1 100644
--- a/ci/build_android_x86.sh
+++ b/scripts/build_android_x86.sh
diff --git a/ci/build_linux.sh b/scripts/build_linux.sh
index f84d247af..f84d247af 100644
--- a/ci/build_linux.sh
+++ b/scripts/build_linux.sh
diff --git a/ci/build_tomtom_minimal.sh b/scripts/build_tomtom_minimal.sh
index a178b9733..a178b9733 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/scripts/build_tomtom_minimal.sh
diff --git a/ci/build_tomtom_plugin.sh b/scripts/build_tomtom_plugin.sh
index 51a15f815..51a15f815 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/scripts/build_tomtom_plugin.sh
diff --git a/ci/build_win32.sh b/scripts/build_win32.sh
index 26315ccd6..26315ccd6 100644
--- a/ci/build_win32.sh
+++ b/scripts/build_win32.sh
diff --git a/ci/build_wince.sh b/scripts/build_wince.sh
index 6e0514e1c..6e0514e1c 100644
--- a/ci/build_wince.sh
+++ b/scripts/build_wince.sh
diff --git a/ci/dbus_tests.py b/scripts/dbus_tests.py
index fe343da32..fe343da32 100644
--- a/ci/dbus_tests.py
+++ b/scripts/dbus_tests.py
diff --git a/ci/docker/tomtom/Dockerfile b/scripts/docker/tomtom/Dockerfile
index adddbdbf8..adddbdbf8 100644
--- a/ci/docker/tomtom/Dockerfile
+++ b/scripts/docker/tomtom/Dockerfile
diff --git a/ci/docker/tomtom/README.md b/scripts/docker/tomtom/README.md
index badaf2707..badaf2707 100644
--- a/ci/docker/tomtom/README.md
+++ b/scripts/docker/tomtom/README.md
diff --git a/ci/docker/tomtom/entrypoint.sh b/scripts/docker/tomtom/entrypoint.sh
index e70e1cb5e..e8f7eabf3 100644
--- a/ci/docker/tomtom/entrypoint.sh
+++ b/scripts/docker/tomtom/entrypoint.sh
@@ -1,3 +1,3 @@
git clone https://github.com/navit-gps/navit.git
cd navit
-bash ci/build_tomtom_minimal.sh
+bash scripts/build_tomtom_minimal.sh
diff --git a/ci/docker/tomtom/tomtom.cache b/scripts/docker/tomtom/tomtom.cache
index ea2cb3faf..ea2cb3faf 100644
--- a/ci/docker/tomtom/tomtom.cache
+++ b/scripts/docker/tomtom/tomtom.cache
diff --git a/ci/generate_contributors.sh b/scripts/generate_contributors.sh
index b957d486d..b957d486d 100644
--- a/ci/generate_contributors.sh
+++ b/scripts/generate_contributors.sh
diff --git a/ci/import_translations.sh b/scripts/import_translations.sh
index 6c18ffa91..6c18ffa91 100644
--- a/ci/import_translations.sh
+++ b/scripts/import_translations.sh
diff --git a/ci/merge_i18n_update.sh b/scripts/merge_i18n_update.sh
index 5fb42d56e..5fb42d56e 100644
--- a/ci/merge_i18n_update.sh
+++ b/scripts/merge_i18n_update.sh
diff --git a/ci/pointer-64.png b/scripts/pointer-64.png
index 904f6878d..904f6878d 100644
--- a/ci/pointer-64.png
+++ b/scripts/pointer-64.png
Binary files differ
diff --git a/ci/publish.sh b/scripts/publish.sh
index b3c0a6298..17b5fbf18 100644
--- a/ci/publish.sh
+++ b/scripts/publish.sh
@@ -22,7 +22,7 @@ cd ~/
git clone git@github.com:navit-gps/infrastructure-blackbox.git
cd infrastructure-blackbox/keyrings/
openssl aes-256-cbc -d -in keystore.gpg -k $KEY > ~/.keystore
-openssl aes-256-cbc -d -in client_secrets.gpg -k $KEY > /root/project/ci/client_secrets.json
+openssl aes-256-cbc -d -in client_secrets.gpg -k $KEY > /root/project/scripts/client_secrets.json
openssl aes-256-cbc -d -in androidpublisher.gpg -k $KEY > /root/project/androidpublisher.dat
cd ~/project
@@ -32,4 +32,4 @@ jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $SP $BINPATH/n
zipalign 4 $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk
apksigner verify -v $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk
-python ~/project/ci/basic_upload_apks.py org.navitproject.navit $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk --noauth_local_webserver
+python ~/project/scripts/basic_upload_apks.py org.navitproject.navit $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk --noauth_local_webserver
diff --git a/ci/run_linux_tests.sh b/scripts/run_linux_tests.sh
index 4c937dc7d..ff91bed6b 100644
--- a/ci/run_linux_tests.sh
+++ b/scripts/run_linux_tests.sh
@@ -15,9 +15,9 @@ linux_test () {
import -window root $CIRCLE_ARTIFACTS/logs_${1}/default.png
# run tests on X11
- bash ~/navit/ci/xdotools.sh ${1}
+ bash ~/navit/scripts/xdotools.sh ${1}
- # python ~/navit/ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
+ # python ~/navit/scripts/dbus_tests.py $CIRCLE_TEST_REPORTS/
# dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
# kill navit instance
diff --git a/ci/setup_android.sh b/scripts/setup_android.sh
index fee29613b..fee29613b 100644
--- a/ci/setup_android.sh
+++ b/scripts/setup_android.sh
diff --git a/ci/setup_common_requirements.sh b/scripts/setup_common_requirements.sh
index 6343194bb..6343194bb 100644
--- a/ci/setup_common_requirements.sh
+++ b/scripts/setup_common_requirements.sh
diff --git a/ci/setup_tomtom_requirements.sh b/scripts/setup_tomtom_requirements.sh
index 98d6de3cd..98d6de3cd 100644
--- a/ci/setup_tomtom_requirements.sh
+++ b/scripts/setup_tomtom_requirements.sh
diff --git a/ci/setup_wince.sh b/scripts/setup_wince.sh
index 0169c447c..0169c447c 100644
--- a/ci/setup_wince.sh
+++ b/scripts/setup_wince.sh
diff --git a/ci/update_download_center.sh b/scripts/update_download_center.sh
index 34d4a95de..34d4a95de 100644
--- a/ci/update_download_center.sh
+++ b/scripts/update_download_center.sh
diff --git a/ci/update_doxygen.sh b/scripts/update_doxygen.sh
index 7a76f1fd1..7a76f1fd1 100644
--- a/ci/update_doxygen.sh
+++ b/scripts/update_doxygen.sh
diff --git a/ci/xdotools.sh b/scripts/xdotools.sh
index f71232b97..a8fc6dea3 100644
--- a/ci/xdotools.sh
+++ b/scripts/xdotools.sh
@@ -15,7 +15,7 @@ send_event (){
import -window root $FRAME_DIR/tmp.png
if [[ "$1" == "mousemove" ]]; then
- composite -gravity NorthWest -geometry +$2+$3 ~/navit/ci/pointer-64.png $FRAME_DIR/tmp.png $FRAME_DIR/${file}.png
+ composite -gravity NorthWest -geometry +$2+$3 ~/navit/scripts/pointer-64.png $FRAME_DIR/tmp.png $FRAME_DIR/${file}.png
else
mv $FRAME_DIR/tmp.png $FRAME_DIR/${file}.png
fi