mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-20 22:26:54 +01:00
remove the dup target stuff (fixing dbg targets)
This commit is contained in:
parent
1d35b7e7e0
commit
12c38ab60c
9 changed files with 24 additions and 162 deletions
|
@ -8,7 +8,6 @@ def BUILD_INFO_NAME = "build-info.txt"
|
|||
// each other
|
||||
def XW_UUID = '"7be0d084-ff89-4d6d-9c78-594773a6f963"' // from comms.h
|
||||
def XWD_UUID = '"b079b640-35fe-11e5-a432-0002a5d5c51b"' // from comms.h
|
||||
def XWDUP_UUID = '"92602f84-1bc5-11ea-978f-2e728ce88125"'
|
||||
def BT_UUIDS = [
|
||||
'xw4fdroidDebug' : XW_UUID,
|
||||
'xw4fdroidRelease' : XW_UUID,
|
||||
|
@ -16,16 +15,11 @@ def BT_UUIDS = [
|
|||
'xw4NoSMSRelease' : XW_UUID,
|
||||
'xw4SMSDebug' : XW_UUID,
|
||||
'xw4SMSRelease' : XW_UUID,
|
||||
|
||||
'xw4dupDebug' : XWDUP_UUID,
|
||||
'xw4dupRelease' : XWDUP_UUID,
|
||||
'xw4dupNoSMSDebug' : XWDUP_UUID,
|
||||
'xw4dupNoSMSRelease' : XWDUP_UUID,
|
||||
]
|
||||
|
||||
// AID must start with F (first 4 bits) and be from 5 to 16 bytes long
|
||||
def NFC_AID_XW4 = "FC8FF510B360"
|
||||
def NFC_AID_XW4dup = "F8960736B33C"
|
||||
def NFC_AID_XW4d = "FDDA0A3EB5E5"
|
||||
|
||||
boolean forFDroid = hasProperty('forFDroid')
|
||||
|
||||
|
@ -130,12 +124,12 @@ android {
|
|||
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4}\""
|
||||
resValue "string", "nfc_aid", "$NFC_AID_XW4"
|
||||
}
|
||||
xw4dup {
|
||||
xw4d {
|
||||
dimension "variant"
|
||||
buildConfigField "String", "DB_NAME", "\"xwddb\"";
|
||||
applicationId "org.eehouse.android.xw4dup"
|
||||
buildConfigField "String", "DB_NAME", "\"xwddb\""
|
||||
applicationId "org.eehouse.android.xw4dbg"
|
||||
manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ]
|
||||
resValue "string", "app_name", "CrossDup"
|
||||
resValue "string", "app_name", "CrossDbg"
|
||||
resValue "string", "nbs_port", "3345"
|
||||
buildConfigField "boolean", "WIDIR_ENABLED", "true"
|
||||
buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true"
|
||||
|
@ -143,24 +137,24 @@ android {
|
|||
buildConfigField "int", "VARIANT_CODE", "3"
|
||||
buildConfigField "boolean", "REPORT_LOCKS", "true"
|
||||
buildConfigField "String", "KEY_FCMID", "\"FBMService_fcmid1\""
|
||||
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4dup}\""
|
||||
resValue "string", "nfc_aid", "$NFC_AID_XW4dup"
|
||||
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4d}\""
|
||||
resValue "string", "nfc_aid", "$NFC_AID_XW4d"
|
||||
}
|
||||
|
||||
xw4dupNoSMS {
|
||||
xw4dNoSMS {
|
||||
dimension "variant"
|
||||
applicationId "org.eehouse.android.xw4dup"
|
||||
applicationId "org.eehouse.android.xw4dbg"
|
||||
buildConfigField "String", "DB_NAME", "\"xwddb\""
|
||||
manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ]
|
||||
resValue "string", "app_name", "CrossDup"
|
||||
resValue "string", "app_name", "CrossDbg"
|
||||
resValue "string", "nbs_port", "3345"
|
||||
buildConfigField "boolean", "WIDIR_ENABLED", "true"
|
||||
buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true"
|
||||
buildConfigField "String", "VARIANT_NAME", "\"Dev/Debug NoSMS\""
|
||||
buildConfigField "int", "VARIANT_CODE", "4"
|
||||
buildConfigField "boolean", "REPORT_LOCKS", "true"
|
||||
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4dup}\""
|
||||
resValue "string", "nfc_aid", "$NFC_AID_XW4dup"
|
||||
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4d}\""
|
||||
resValue "string", "nfc_aid", "$NFC_AID_XW4d"
|
||||
}
|
||||
|
||||
xw4SMS {
|
||||
|
@ -241,20 +235,20 @@ android {
|
|||
jniLibs.srcDir "../libs-xw4NoSMSDebug"
|
||||
}
|
||||
}
|
||||
xw4dup {
|
||||
xw4d {
|
||||
release {
|
||||
jniLibs.srcDir "../libs-xw4dupRelease"
|
||||
jniLibs.srcDir "../libs-xw4dRelease"
|
||||
}
|
||||
debug {
|
||||
jniLibs.srcDir "../libs-xw4dupDebug"
|
||||
jniLibs.srcDir "../libs-xw4dDebug"
|
||||
}
|
||||
}
|
||||
xw4dupNoSMS {
|
||||
xw4dNoSMS {
|
||||
release {
|
||||
jniLibs.srcDir "../libs-xw4dupNoSMSRelease"
|
||||
jniLibs.srcDir "../libs-xw4dNoSMSRelease"
|
||||
}
|
||||
debug {
|
||||
jniLibs.srcDir "../libs-xw4dupNoSMSDebug"
|
||||
jniLibs.srcDir "../libs-xw4dNoSMSDebug"
|
||||
}
|
||||
}
|
||||
xw4SMS {
|
||||
|
@ -302,10 +296,10 @@ dependencies {
|
|||
|
||||
// 2.6.8 is probably as far forward as I can go without upping my
|
||||
// min-supported SDK version
|
||||
xw4dupImplementation('com.crashlytics.sdk.android:crashlytics:2.6.3@aar') { // rm-for-fdroid
|
||||
xw4dImplementation('com.crashlytics.sdk.android:crashlytics:2.6.3@aar') { // rm-for-fdroid
|
||||
transitive = true // rm-for-fdroid
|
||||
} // rm-for-fdroid
|
||||
xw4dupNoSMSImplementation('com.crashlytics.sdk.android:crashlytics:2.6.3@aar') { // rm-for-fdroid
|
||||
xw4dNoSMSImplementation('com.crashlytics.sdk.android:crashlytics:2.6.3@aar') { // rm-for-fdroid
|
||||
transitive = true // rm-for-fdroid
|
||||
} // rm-for-fdroid
|
||||
|
||||
|
@ -402,18 +396,18 @@ afterEvaluate {
|
|||
String copyStringsTask = "copyStringsXw4D"
|
||||
task "$copyStringsTask"(type: Exec) {
|
||||
workingDir './'
|
||||
environment.put('APPNAME', 'CrossDup')
|
||||
environment.put('APPNAME', 'CrossDbg')
|
||||
commandLine 'make', '-f', '../scripts/Variant.mk',
|
||||
"src/xw4dup/res/values/strings.xml"
|
||||
"src/xw4d/res/values/strings.xml"
|
||||
}
|
||||
preBuild.dependsOn copyStringsTask
|
||||
|
||||
String copyStringsTaskNoSMS = "copyStringsXw4DNoSMS"
|
||||
task "$copyStringsTaskNoSMS"(type: Exec) {
|
||||
workingDir './'
|
||||
environment.put('APPNAME', 'CrossDup')
|
||||
environment.put('APPNAME', 'CrossDbg')
|
||||
commandLine 'make', '-f', '../scripts/Variant.mk',
|
||||
"src/xw4dupNoSMS/res/values/strings.xml"
|
||||
"src/xw4dNoSMS/res/values/strings.xml"
|
||||
}
|
||||
preBuild.dependsOn copyStringsTaskNoSMS
|
||||
}
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
../xw4d/AndroidManifest.xml
|
|
@ -1,127 +0,0 @@
|
|||
{
|
||||
"project_info": {
|
||||
"project_number": "801272813571",
|
||||
"firebase_url": "https://fcmtest-9fe99.firebaseio.com",
|
||||
"project_id": "fcmtest-9fe99",
|
||||
"storage_bucket": "fcmtest-9fe99.appspot.com"
|
||||
},
|
||||
"client": [
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:801272813571:android:15f4eb80a9b07720",
|
||||
"android_client_info": {
|
||||
"package_name": "com.google.firebase.fiamquickstart"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyCl3lfUITEX0EscF2aeDZY4G-DNL2xeEZ8"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:801272813571:android:2d4684b9d573e182",
|
||||
"android_client_info": {
|
||||
"package_name": "org.eehouse.android.xw4"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyCl3lfUITEX0EscF2aeDZY4G-DNL2xeEZ8"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:801272813571:android:8c4ed916336414b2",
|
||||
"android_client_info": {
|
||||
"package_name": "org.eehouse.android.xw4dbg"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyCl3lfUITEX0EscF2aeDZY4G-DNL2xeEZ8"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:801272813571:android:ded92ad1a9f5b318d41636",
|
||||
"android_client_info": {
|
||||
"package_name": "org.eehouse.android.xw4dup"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyCl3lfUITEX0EscF2aeDZY4G-DNL2xeEZ8"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "801272813571-g3lfciu89q8ffb7ahasrce5nj3vsghot.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"configuration_version": "1"
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
../../../../../../xw4NoSMS/java/org/eehouse/android/xw4/CrashTrack.java
|
|
@ -1 +0,0 @@
|
|||
../../../../../../xw4NoSMS/java/org/eehouse/android/xw4/FBMService.java
|
Binary file not shown.
Before Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
Before Width: | Height: | Size: 3.2 KiB |
|
@ -1 +0,0 @@
|
|||
../../../../../../../src/xw4d/java/org/eehouse/android/xw4/CrashTrack.java
|
|
@ -1 +0,0 @@
|
|||
../../../../../../../src/xw4NoSMS/java/org/eehouse/android/xw4/FBMService.java
|
Loading…
Reference in a new issue