CBL-5461 : Remove ios submodule from ios-ee repo (#3245)

* CBL-5461 : Remove ios submodule from ios-ee repo We don't really need couchbase-lite-ios submodule inside couchbase-lite-ios-ee repo as in build we always checkout couchbase-lite-ios submodule to the top of the master or release branch. The reason that we have the submodule is to try to keep CE and EE repo in sync which turns out to be an unnecessary unproductivity task. We are now removing the ios submdoule from the ee repo now so that we don’t need to make them in-sync anymore. Plus : move download_vector_search_extension.sh script to ee repo. Plus : Minor fix to the encryption key property in CBLDatabaseConfiguration.m to add check readonly.
couchbase · Mar 4, 2024 · 48f40a4 · 48f40a4
1 parent 52ebcbb
commit 48f40a4
Show file tree

Hide file tree

Showing 9 changed files with 825 additions and 834 deletions.
diff --git a/CouchbaseLite.xcodeproj/project.pbxproj b/CouchbaseLite.xcodeproj/project.pbxproj
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,9 +2,6 @@ pipeline {
     options {
         disableConcurrentBuilds() 
     }
-    environment {
-       PRODUCT = 'couchbase-lite-ios'
-    }
     agent { label 'mobile-builder-ios-pull-request'  }
     stages {
         stage('Cleanup'){
@@ -30,8 +27,12 @@ pipeline {
                     shopt -s extglob dotglob
 
                     # move PR related repo to tmp folder
-                    mkdir tmp
-                    mv !(tmp) tmp
+                    mkdir couchbase-lite-ios
+                    mv !(couchbase-lite-ios) couchbase-lite-ios
+                    # submodule update inside lite-ios
+                    pushd couchbase-lite-ios
+                    git submodule update --init --recursive
+                    popd
 
                     # Sometimes the PR depends on a PR in the EE repo as well. It will look for a branch with the same name as the one in CE repo. If not found, use the name of the target branch (master, release/XXX etc) 
                     # clone the EE-repo
@@ -40,29 +41,17 @@ pipeline {
 
                     # submodule update for core-EE
                     pushd couchbase-lite-ios-ee
-                    git submodule update --init couchbase-lite-core-EE
-                    popd
-
-                    # restructure folders
-                    mv couchbase-lite-ios-ee/* .
-                    rm -rf couchbase-lite-ios && mv tmp couchbase-lite-ios
-                    
-                    # submodule update inside lite-ios
-                    pushd couchbase-lite-ios
                     git submodule update --init --recursive
                     popd
-
-                    # remove tmp folders
-                    rmdir couchbase-lite-ios-ee
                     
-                    ./Scripts/prepare_project.sh
+                    ./couchbase-lite-ios-ee/Scripts/prepare_project.sh
                 """
             }
         }
         stage('Build'){
             steps {
                 sh """ 
-		            ./${env.PRODUCT}/Scripts/pull_request_build.sh
+		            ./couchbase-lite-ios/Scripts/pull_request_build.sh
                 """
             }
         }

diff --git a/Objective-C/CBLDatabaseConfiguration.m b/Objective-C/CBLDatabaseConfiguration.m
@@ -64,6 +64,14 @@ - (void) setDirectory: (NSString*)directory {
     _directory = directory;
 }
 
+#ifdef COUCHBASE_ENTERPRISE
+- (void) setEncryptionKey: (CBLEncryptionKey*)encryptionKey {
+    [self checkReadonly];
+
+    _encryptionKey = encryptionKey;
+}
+#endif
+
 #pragma mark - Internal
 
 - (void) checkReadonly {

diff --git a/Scripts/download_vector_search_extension.sh b/Scripts/download_vector_search_extension.sh
diff --git a/Scripts/generate_objc_release_zip.sh b/Scripts/generate_objc_release_zip.sh
@@ -4,11 +4,11 @@ set -e
 
 function usage
 {
-  echo "Usage: ${0} -o <Output Directory> [-v <Version (<Version Number>[-<Build Number>])>]"
-  echo "\nOptions:"
-  echo "  --notest\t create a release package but no tests needs to be run"
-  echo "  --nocov\t create a release package, run tests but no code coverage zip"
-  echo "  --nodocs\t create a release package without API docs"
+  echo -e "Usage: ${0} -o <Output Directory> -e <Edition; ce, community, ee, enterprise> [-v <Version (<Version Number>[-<Build Number>])>]"
+  echo -e "\nOptions:"
+  echo -e "  --notest\t create a release package but no tests needs to be run"
+  echo -e "  --nocov\t create a release package, run tests but no code coverage zip"
+  echo -e "  --nodocs\t create a release package without API docs"
 }
 
 function checkCrashLogs
@@ -30,8 +30,9 @@ do
       OUTPUT_DIR=${2}
       shift
       ;;
-      --EE)
-      EE=YES
+      -e)
+      EDITION=${2}
+      shift
       ;;
       --notest)
       NO_TEST=YES
@@ -59,23 +60,35 @@ then
   exit 4
 fi
 
-if [ -z "$EE" ]
+if [ -z "$EDITION" ]
+then
+  usage
+  exit 4
+fi
+
+if [ "$EDITION" == "ce" ] || [ "$EDITION" == "community" ]
 then
   SCHEME_PREFIX="CBL"
   CONFIGURATION="Release"
   CONFIGURATION_TEST="Debug"
   COVERAGE_NAME="objc_coverage"
   EDITION="community"
-else
+elif [ "$EDITION" == "ee" ] || [ "$EDITION" == "enterprise" ]
+then
   SCHEME_PREFIX="CBL_EE"
   CONFIGURATION="Release_EE"
   CONFIGURATION_TEST="Debug_EE"
   COVERAGE_NAME="objc_coverage-ee"
   EDITION="enterprise"
   EXTRA_CMD_OPTIONS="--EE"
   OPTS="--EE"
+else
+  echo "Invalid Edition"
+  exit 4
 fi
 
+echo "Build Edition : ${EDITION}"
+
 if [ -z "$PRETTY" ]
 then
   XCPRETTY="cat"

diff --git a/Scripts/generate_package_manifest.sh b/Scripts/generate_package_manifest.sh
@@ -65,4 +65,3 @@ rm "Package.swift"
 # generates the package manifest
 FILENAME="$(basename $ZIP_PATH)-Package.swift"
 createManifest $OUTPUT_DIR/$FILENAME
-  
diff --git a/Scripts/generate_swift_release_zip.sh b/Scripts/generate_swift_release_zip.sh
@@ -4,11 +4,11 @@ set -e
 
 function usage
 {
-  echo "Usage: ${0} -o <Output Directory> [-v <Version (<Version Number>[-<Build Number>])>]"
-  echo "\nOptions:"
-  echo "  --notest\t create a release package but no tests needs to be run"
-  echo "  --nocov\t create a release package, run tests but no code coverage zip"
-  echo "  --nodocs\t create a release package without API docs"
+  echo -e "Usage: ${0} -o <Output Directory> -e <Edition; ce, community, ee, enterprise> [-v <Version (<Version Number>[-<Build Number>])>]"
+  echo -e "\nOptions:"
+  echo -e "  --notest\t create a release package but no tests needs to be run"
+  echo -e "  --nocov\t create a release package, run tests but no code coverage zip"
+  echo -e "  --nodocs\t create a release package without API docs"
 }
 
 function checkCrashLogs
@@ -30,8 +30,9 @@ do
       OUTPUT_DIR=${2}
       shift
       ;;
-      --EE)
-      EE=YES
+      -e)
+      EDITION=${2}
+      shift
       ;;
       --notest)
       NO_TEST=YES
@@ -59,22 +60,34 @@ then
   exit 4
 fi
 
-if [ -z "$EE" ]
+if [ -z "$EDITION" ]
+then
+  usage
+  exit 4
+fi
+
+if [ "$EDITION" == "ce" ] || [ "$EDITION" == "community" ]
 then
   SCHEME_PREFIX="CBL"
   CONFIGURATION="Release"
   CONFIGURATION_TEST="Debug"
   COVERAGE_NAME="swift_coverage"
   EDITION="community"
-else
+elif [ "$EDITION" == "ee" ] || [ "$EDITION" == "enterprise" ]
+then
   SCHEME_PREFIX="CBL_EE"
   CONFIGURATION="Release_EE"
   CONFIGURATION_TEST="Debug_EE"
   COVERAGE_NAME="swift_coverage-ee"
   EDITION="enterprise"
   OPTS="--EE"
+else
+  echo "Invalid Edition"
+  exit 4
 fi
 
+echo "Build Edition : ${EDITION}"
+
 if [ -z "$PRETTY" ]
 then
   XCPRETTY="cat"
@@ -190,4 +203,3 @@ fi
 rm -rf "$BUILD_DIR"
 rm -rf "$OUTPUT_SWIFT_XC_DIR"
 rm -rf "$OUTPUT_DOCS_DIR"
-
diff --git a/xcconfigs/CBL_EE_ObjC.xcconfig b/xcconfigs/CBL_EE_ObjC.xcconfig
@@ -20,4 +20,4 @@
 #include "CBL_EE_Common.xcconfig"
 #include "CBL_ObjC.xcconfig"
 
-CBL_EXPORTED_SYMBOLS_FILE = ../Sources/Objective-C/CouchbaseLite.exp
+CBL_EXPORTED_SYMBOLS_FILE = ../couchbase-lite-ios-ee/Sources/Objective-C/CouchbaseLite.exp
diff --git a/xcconfigs/CBL_EE_Swift.xcconfig b/xcconfigs/CBL_EE_Swift.xcconfig
@@ -21,4 +21,4 @@
 #include "CBL_Swift.xcconfig"
 
 CBL_EXPORTED_SYMBOLS_FILE    = // None
-MODULEMAP_PRIVATE_FILE       = ../Sources/Swift/CouchbaseLiteSwift.private.modulemap
+MODULEMAP_PRIVATE_FILE       = ../couchbase-lite-ios-ee/Sources/Swift/CouchbaseLiteSwift.private.modulemap
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,4 +65,3 @@ rm "Package.swift"
		# generates the package manifest
		FILENAME="$(basename $ZIP_PATH)-Package.swift"
		createManifest $OUTPUT_DIR/$FILENAME