Fix asset directories

couchbaselabs · Dec 11, 2024 · 984e1aa · 984e1aa
1 parent e8c27e3
commit 984e1aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/servers/jak/android/app/build.gradle b/servers/jak/android/app/build.gradle
@@ -28,6 +28,8 @@ ext {
 
     SHARED_DIR = "${ROOT_DIR}/shared"
     ETC_DIR = "${ROOT_DIR}/etc"
+    ASSETS_ROOT = "${ROOT_DIR}/../../dataset/server"
+    BLOB_ASSETS_DIR = "${ASSETS_ROOT}/blobs"
 
     REPORTS_DIR = "${buildDir}/reports"
 
@@ -42,7 +44,7 @@ def USE_LOCAL_MAVEN = COUCHBASE_LITE_VERSION.endsWith("SNAPSHOT")
 
 def DATASET_VERSION = project.hasProperty("datasetVersion") ? datasetVersion : ""
 if (!(DATASET_VERSION =~ /^\d{1,2}\.\d{1,2}/)) { throw new InvalidUserDataException ("!!! Bad dataset version: ${DATASET_VERSION}") }
-def ASSETS_DIR = "${ROOT_DIR}/../../dataset/server/${DATASET_VERSION}"
+def DB_ASSETS_DIR = "${ASSETS_ROOT}/dbs/${DATASET_VERSION}"
 
 println "Building test server ${SERVER_VERSION}@${SERVER_BUILD} for CBL Android ${COUCHBASE_LITE_VERSION} with ${DATASET_VERSION} data"
 
@@ -104,7 +106,8 @@ android {
                 "${SHARED_DIR}/server/main/java"
             ]
             assets.srcDirs = [
-                ASSETS_DIR,
+                DB_ASSETS_DIR,
+                BLOB_ASSETS_DIR,
                 "${SHARED_DIR}/assets"
             ]
         }

diff --git a/servers/jak/desktop/app/build.gradle b/servers/jak/desktop/app/build.gradle
@@ -36,6 +36,9 @@ ext {
     ASSETS_DIR = "${ROOT_DIR}/../../dataset/server"
     SHARED_DIR = "${ROOT_DIR}/shared"
     ETC_DIR = "${ROOT_DIR}/etc"
+    ASSETS_ROOT = "${ROOT_DIR}/../../dataset/server"
+    BLOB_ASSETS_DIR = "${ASSETS_ROOT}/blobs"
+
 
     REPORTS_DIR = "${buildDir}/reports"
 
@@ -49,7 +52,7 @@ def USE_LOCAL_MAVEN = COUCHBASE_LITE_VERSION.endsWith("SNAPSHOT")
 
 def DATASET_VERSION = project.hasProperty("datasetVersion") ? datasetVersion : ""
 if (!(DATASET_VERSION  =~ /^\d{1,2}\.\d{1,2}/)) { throw new InvalidUserDataException ("!!! Bad dataset version: ${DATASET_VERSION}") }
-def ASSETS_DIR = "${ROOT_DIR}/../../dataset/server/${DATASET_VERSION}"
+def DB_ASSETS_DIR = "${ASSETS_ROOT}/dbs/${DATASET_VERSION}"
 
 // Set -Pverbose to get full console logs for tests
 def VERBOSE = project.hasProperty("verbose")
@@ -76,7 +79,8 @@ java {
                 "${SHARED_DIR}/server/main/java"
             ]
             resources.srcDirs = [
-                ASSETS_DIR,
+                DB_ASSETS_DIR,
+                BLOB_ASSETS_DIR,
                 "${SHARED_DIR}/assets"
             ]
         }

diff --git a/servers/jak/webservice/app/build.gradle b/servers/jak/webservice/app/build.gradle
@@ -35,6 +35,9 @@ ext {
 
     SHARED_DIR = "${ROOT_DIR}/shared"
     ETC_DIR = "${ROOT_DIR}/etc"
+    ASSETS_ROOT = "${ROOT_DIR}/../../dataset/server"
+    BLOB_ASSETS_DIR = "${ASSETS_ROOT}/blobs"
+
 
     REPORTS_DIR = "${buildDir}/reports"
 
@@ -48,7 +51,7 @@ def USE_LOCAL_MAVEN = COUCHBASE_LITE_VERSION.endsWith("SNAPSHOT")
 
 def DATASET_VERSION = project.hasProperty("datasetVersion") ? datasetVersion : ""
 if (!(DATASET_VERSION  =~ /^\d{1,2}\.\d{1,2}/)) { throw new InvalidUserDataException ("!!! Bad dataset version: ${DATASET_VERSION}") }
-def ASSETS_DIR = "${ROOT_DIR}/../../dataset/server/${DATASET_VERSION}"
+def DB_ASSETS_DIR = "${ASSETS_ROOT}/dbs/${DATASET_VERSION}"
 
 // Set -Pverbose to get full console logs for tests
 def VERBOSE = project.hasProperty("verbose")
@@ -74,7 +77,8 @@ java {
                 "${SHARED_DIR}/jvm/main/java"
             ]
             resources.srcDirs = [
-                ASSETS_DIR,
+                DB_ASSETS_DIR,
+                BLOB_ASSETS_DIR,
                 "${SHARED_DIR}/assets"
             ]
         }