Merge pull request #6 from marimeireles/rename

Rename
jupyter-xeus · Dec 23, 2020 · 78eaf34 · 78eaf34
2 parents 3d40363 + ec72737
commit 78eaf34
Show file tree

Hide file tree

Showing 34 changed files with 291 additions and 276 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
@@ -4,10 +4,10 @@ jobs:
       matrix:
         shared:
           xsql_use_shared_xeus: 1
-          xsql_use_shared_xeus_soci: 1
+          xsql_use_shared_xeus_sql: 1
         static:
           xsql_use_shared_xeus: 0
-          xsql_use_shared_xeus_soci: 0
+          xsql_use_shared_xeus_sql: 0
     pool:
       vmImage: ubuntu-16.04
     timeoutInMinutes: 360

diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml
@@ -10,35 +10,35 @@ steps:
     displayName: Install dependencies
 
   - script: |
-      source activate xeus-soci
+      source activate xeus-sql
       conda install gcc_linux-64=7.5.0 gcc_impl_linux-64=7.5.0 gxx_linux-64=7.5.0 gxx_impl_linux-64 -c conda-forge;
     condition: eq('${{ parameters.platform }}', 'Linux')
     displayName: Install conda-forge compilers
 
   - script: |
-      source activate xeus-soci
+      source activate xeus-sql
       mkdir build
       cd build
-      if [[ $(xsoci_used_shared_xeus_soci) == '0' ]]; then
-        CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXSOCI_BUILD_SHARED=OFF -DXSOCI_USE_SHARED_XEUS_SOCI=OFF";
+      if [[ $(xsql_used_shared_xeus_sql) == '0' ]]; then
+        CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXSQL_BUILD_SHARED=OFF -DXSQL_USE_SHARED_XEUS_SQL=OFF";
       fi
-      if [[ $(xsoci_used_shared_xeus) == '0' ]]; then
-        CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXSOCI_USE_SHARED_XEUS=OFF";
+      if [[ $(xsql_used_shared_xeus) == '0' ]]; then
+        CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXSQL_USE_SHARED_XEUS=OFF";
       fi
       # The xeus conda package is built with CMAKE_CXX_STANDARD=17
       CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DCMAKE_CXX_STANDARD=17";
-      cmake -D CMAKE_PREFIX_PATH=$CONDA_PREFIX -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DXSOCI_DOWNLOAD_GTEST=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX ${CMAKE_EXTRA_ARGS} $(Build.SourcesDirectory)
-    displayName: Configure xeus-soci
+      cmake -D CMAKE_PREFIX_PATH=$CONDA_PREFIX -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DXSQL_DOWNLOAD_GTEST=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX ${CMAKE_EXTRA_ARGS} $(Build.SourcesDirectory)
+    displayName: Configure xeus-sql
     workingDirectory: $(Build.BinariesDirectory)
 
   - script: |
-      source activate xeus-soci
+      source activate xeus-sql
       make install -j2
-    displayName: Build xeus-soci
+    displayName: Build xeus-sql
     workingDirectory: $(Build.BinariesDirectory)/build
 
   - script: |
-      source activate xeus-soci
-      ./test_xeus_soci
-    displayName: Test xeus-soci (C++)
+      source activate xeus-sql
+      ./test_xeus_sql
+    displayName: Test xeus-sql (C++)
     workingDirectory: $(Build.BinariesDirectory)/build/test