Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix asset directories #107

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Fix asset directories #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions servers/jak/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"

Expand Down Expand Up @@ -104,7 +106,8 @@ android {
"${SHARED_DIR}/server/main/java"
]
assets.srcDirs = [
ASSETS_DIR,
DB_ASSETS_DIR,
BLOB_ASSETS_DIR,
"${SHARED_DIR}/assets"
]
}
Expand Down
8 changes: 6 additions & 2 deletions servers/jak/desktop/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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")
Expand All @@ -76,7 +79,8 @@ java {
"${SHARED_DIR}/server/main/java"
]
resources.srcDirs = [
ASSETS_DIR,
DB_ASSETS_DIR,
BLOB_ASSETS_DIR,
"${SHARED_DIR}/assets"
]
}
Expand Down
8 changes: 6 additions & 2 deletions servers/jak/webservice/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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")
Expand All @@ -74,7 +77,8 @@ java {
"${SHARED_DIR}/jvm/main/java"
]
resources.srcDirs = [
ASSETS_DIR,
DB_ASSETS_DIR,
BLOB_ASSETS_DIR,
"${SHARED_DIR}/assets"
]
}
Expand Down
Loading