Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use auto-generated BuildConstants class instead of my own act-alike

Browse source
This commit is contained in:
Eric House 2013-12-03 07:15:03 -08:00
parent b5d6c513a6
commit 3ccc9ac0f1
5 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/build.xml
View file

@ -93,7 +93,6 @@
<arg value="${INITIAL_CLIENT_VERS}" /> <arg value="${INITIAL_CLIENT_VERS}" />
<arg value="${CHAT_ENABLED}" /> <arg value="${CHAT_ENABLED}" />
<arg value="${THUMBNAIL_ENABLED}" /> <arg value="${THUMBNAIL_ENABLED}" />
<arg value="${build.target}" />
</exec> </exec>
</target> </target>
<!-- <!--

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
View file

@ -42,7 +42,7 @@ import junit.framework.Assert;
public class DbgUtils { public class DbgUtils {
private static final String TAG = "XW4"; private static final String TAG = "XW4";
private static boolean s_doLog = BuildConstants.IS_DEBUG_BUILD; private static boolean s_doLog = BuildConfig.DEBUG;
private static Time s_time = new Time(); private static Time s_time = new Time();
@ -53,7 +53,7 @@ public class DbgUtils {
public static void logEnable( Context context ) public static void logEnable( Context context )
{ {
boolean on = BuildConstants.IS_DEBUG_BUILD || boolean on = BuildConfig.DEBUG ||
XWPrefs.getPrefsBoolean( context, R.string.key_logging_on, false ); XWPrefs.getPrefsBoolean( context, R.string.key_logging_on, false );
logEnable( on ); logEnable( on );
} }

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -671,7 +671,7 @@ public class GamesList extends XWExpandableListActivity
if ( m_menuPrepared ) { if ( m_menuPrepared ) {
boolean nothingSelected = 0 == (nGroupsSelected + nGamesSelected); boolean nothingSelected = 0 == (nGroupsSelected + nGamesSelected);
boolean showDbg = BuildConstants.IS_DEBUG_BUILD boolean showDbg = BuildConfig.DEBUG
|| XWPrefs.getDebugEnabled( this ); || XWPrefs.getDebugEnabled( this );
showItemsIf( DEBUG_ITEMS, menu, nothingSelected && showDbg ); showItemsIf( DEBUG_ITEMS, menu, nothingSelected && showDbg );
Utils.setItemVisible( menu, R.id.games_menu_loaddb, Utils.setItemVisible( menu, R.id.games_menu_loaddb,

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java
View file

@ -40,8 +40,7 @@ public class XWSumListPreference extends XWListPreference {
{ {
super.onAttachedToActivity(); super.onAttachedToActivity();
if ( BuildConstants.IS_DEBUG_BUILD || if ( BuildConfig.DEBUG || XWPrefs.getDebugEnabled( m_context ) ) {
XWPrefs.getDebugEnabled( m_context ) ) {
CharSequence[] entries = getEntries(); CharSequence[] entries = getEntries();
CharSequence lastRow = entries[entries.length - 1]; CharSequence lastRow = entries[entries.length - 1];
boolean done = false; boolean done = false;

2
xwords4/android/scripts/genvers.sh
View file

@ -7,7 +7,6 @@ VARIANT=$2
CLIENT_VERS_RELAY=$3 CLIENT_VERS_RELAY=$3
CHAT_SUPPORTED=$4 CHAT_SUPPORTED=$4
THUMBNAIL_SUPPORTED=$5 THUMBNAIL_SUPPORTED=$5
BUILD_TARGET=$6
cd $(dirname $0) cd $(dirname $0)
cd ../../ cd ../../
@ -38,7 +37,6 @@ class BuildConstants {
public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY; public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY;
public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED; public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED;
public static final boolean THUMBNAIL_SUPPORTED = $THUMBNAIL_SUPPORTED; public static final boolean THUMBNAIL_SUPPORTED = $THUMBNAIL_SUPPORTED;
public static final boolean IS_DEBUG_BUILD = "$BUILD_TARGET".equals("debug");
} }
EOF EOF