Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-30 13:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1064620: Replace # with //# for IDE integration. r=nalexander

Browse Source
This commit is contained in:
Nick Alexander 2014-10-10 21:11:56 +01:00
parent 2c7a2c36e4
commit 3f68194d7f
17 changed files with 112 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
mobile/android/base/AppConstants.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@ -31,11 +31,11 @@ public class AppConstants {
public static final class Versions {
public static final int MIN_SDK_VERSION = @MOZ_ANDROID_MIN_SDK_VERSION@;
public static final int MAX_SDK_VERSION =
#ifdef MOZ_ANDROID_MAX_SDK_VERSION
//#ifdef MOZ_ANDROID_MAX_SDK_VERSION
@MOZ_ANDROID_MAX_SDK_VERSION@;
#else
//#else
999;
#endif
//#endif
/*
* The SDK_INT >= N check can only pass if our MAX_SDK_VERSION is
@ -93,11 +93,11 @@ public class AppConstants {
public static final String MOZILLA_VERSION = @MOZILLA_VERSION@;
public static final String MOZ_STUMBLER_API_KEY =
#ifdef MOZ_ANDROID_MLS_STUMBLER
//#ifdef MOZ_ANDROID_MLS_STUMBLER
"@MOZ_STUMBLER_API_KEY@";
#else
//#else
null;
#endif
//#endif
public static final boolean MOZ_STUMBLER_BUILD_TIME_ENABLED = (MOZ_STUMBLER_API_KEY != null);
public static final String MOZ_CHILD_PROCESS_NAME = "@MOZ_CHILD_PROCESS_NAME@";
@ -122,137 +122,137 @@ public class AppConstants {
public static final int MOZ_MIN_CPU_VERSION = @MOZ_MIN_CPU_VERSION@;
public static final boolean MOZ_ANDROID_ANR_REPORTER =
#ifdef MOZ_ANDROID_ANR_REPORTER
//#ifdef MOZ_ANDROID_ANR_REPORTER
true;
#else
//#else
false;
#endif
//#endif
public static final String MOZ_PKG_SPECIAL =
#ifdef MOZ_PKG_SPECIAL
//#ifdef MOZ_PKG_SPECIAL
"@MOZ_PKG_SPECIAL@";
#else
//#else
null;
#endif
//#endif
/**
* Whether this APK was built with constrained resources --
* no xhdpi+ images, for example.
*/
public static final boolean MOZ_ANDROID_RESOURCE_CONSTRAINED =
#ifdef MOZ_ANDROID_RESOURCE_CONSTRAINED
//#ifdef MOZ_ANDROID_RESOURCE_CONSTRAINED
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_SERVICES_HEALTHREPORT =
#ifdef MOZ_SERVICES_HEALTHREPORT
//#ifdef MOZ_SERVICES_HEALTHREPORT
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_TELEMETRY_ON_BY_DEFAULT =
#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
//#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
true;
#else
//#else
false;
#endif
//#endif
public static final String TELEMETRY_PREF_NAME =
"toolkit.telemetry.enabled";
public static final boolean MOZ_TELEMETRY_REPORTING =
#ifdef MOZ_TELEMETRY_REPORTING
//#ifdef MOZ_TELEMETRY_REPORTING
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_CRASHREPORTER =
#if MOZ_CRASHREPORTER
//#if MOZ_CRASHREPORTER
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_DATA_REPORTING =
#ifdef MOZ_DATA_REPORTING
//#ifdef MOZ_DATA_REPORTING
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_LOCALE_SWITCHER =
#ifdef MOZ_LOCALE_SWITCHER
//#ifdef MOZ_LOCALE_SWITCHER
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_UPDATER =
#ifdef MOZ_UPDATER
//#ifdef MOZ_UPDATER
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_WEBSMS_BACKEND =
#ifdef MOZ_WEBSMS_BACKEND
//#ifdef MOZ_WEBSMS_BACKEND
true;
#else
//#else
false;
#endif
//#endif
// Android Beam is only supported on API14+, so we don't even bother building
// it if this APK doesn't include API14 support.
public static final boolean MOZ_ANDROID_BEAM =
#ifdef MOZ_ANDROID_BEAM
//#ifdef MOZ_ANDROID_BEAM
Versions.feature14Plus;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_ANDROID_APZ =
#ifdef MOZ_ANDROID_APZ
//#ifdef MOZ_ANDROID_APZ
true;
#else
//#else
false;
#endif
//#endif
// See this wiki page for more details about channel specific build defines:
// https://wiki.mozilla.org/Platform/Channel-specific_build_defines
public static final boolean RELEASE_BUILD =
#ifdef RELEASE_BUILD
//#ifdef RELEASE_BUILD
true;
#else
//#else
false;
#endif
//#endif
public static final boolean DEBUG_BUILD =
#ifdef MOZ_DEBUG
//#ifdef MOZ_DEBUG
true;
#else
//#else
false;
#endif
//#endif
public static final boolean MOZ_MEDIA_PLAYER =
#ifdef MOZ_NATIVE_DEVICES
//#ifdef MOZ_NATIVE_DEVICES
true;
#else
//#else
false;
#endif
//#endif
// Official corresponds, roughly, to whether this build is performed on
// Mozilla's continuous integration infrastructure. You should disable
// developer-only functionality when this flag is set.
public static final boolean MOZILLA_OFFICIAL =
#ifdef MOZILLA_OFFICIAL
//#ifdef MOZILLA_OFFICIAL
true;
#else
//#else
false;
#endif
//#endif
public static final boolean ANDROID_DOWNLOADS_INTEGRATION =
#ifdef MOZ_ANDROID_DOWNLOADS_INTEGRATION

2
mobile/android/base/Makefile.in
View File

@ -201,6 +201,7 @@ preprocessed := $(addsuffix .in,$(subst generated/org/mozilla/gecko/,,$(filter g
preprocessed_PATH := generated/org/mozilla/gecko
preprocessed_KEEP_PATH := 1
preprocessed_FLAGS := --marker='//\\\#'
PP_TARGETS += preprocessed
@ -214,6 +215,7 @@ preprocessed_package := $(addsuffix .in,$(subst $(android_package_dir)/,,$(filte
preprocessed_package_PATH := $(android_package_dir)
preprocessed_package_KEEP_PATH := 1
preprocessed_package_FLAGS := --marker='//\\\#'
PP_TARGETS += preprocessed_package

2
mobile/android/base/SysInfo.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this

8
mobile/android/base/background/common/GlobalConstants.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -16,11 +16,11 @@ public class GlobalConstants {
// If this is an official build, 'default' means 'release'.
// Otherwise, it means 'dev'.
public static final String MOZ_UPDATE_CHANNEL = "@MOZ_UPDATE_CHANNEL@";
#ifdef MOZ_OFFICIAL_BRANDING
//#ifdef MOZ_OFFICIAL_BRANDING
public static final boolean MOZ_OFFICIAL_BRANDING = true;
#else
//#else
public static final boolean MOZ_OFFICIAL_BRANDING = false;
#endif
//#endif
public static final long BUILD_TIMESTAMP_SECONDS = @MOZ_BUILD_TIMESTAMP@L;
public static final long BUILD_TIMESTAMP_MSEC = 1000L * @MOZ_BUILD_TIMESTAMP@L;

2
mobile/android/base/background/healthreport/HealthReportConstants.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

2
mobile/android/base/fxa/FxAccountConstants.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

6
mobile/android/base/mozglue/GeckoLoader.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
@ -226,7 +226,7 @@ public final class GeckoLoader {
}
}
#ifdef MOZ_LINKER_EXTRACT
//#ifdef MOZ_LINKER_EXTRACT
putenv("MOZ_LINKER_EXTRACT=1");
// Ensure that the cache dir is world-writable
File cacheDir = new File(linkerCache);
@ -235,7 +235,7 @@ public final class GeckoLoader {
cacheDir.setExecutable(true, false);
cacheDir.setReadable(true, false);
}
#endif
//#endif
}
@RobocopTarget

2
mobile/android/base/sync/SyncConstants.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
//#filter substitution
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

10
mobile/android/base/widget/ThemedEditText.java.in
View File

@ -1,5 +1,5 @@
#filter substitution
#define VIEW_NAME_SUFFIX EditText
#define BASE_TYPE android.widget.EditText
#define STYLE_CONSTRUCTOR 1
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX EditText
//#define BASE_TYPE android.widget.EditText
//#define STYLE_CONSTRUCTOR 1
//#include ThemedView.java.frag

10
mobile/android/base/widget/ThemedImageButton.java.in
View File

@ -1,5 +1,5 @@
#filter substitution
#define VIEW_NAME_SUFFIX ImageButton
#define BASE_TYPE android.widget.ImageButton
#define STYLE_CONSTRUCTOR 1
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX ImageButton
//#define BASE_TYPE android.widget.ImageButton
//#define STYLE_CONSTRUCTOR 1
//#include ThemedView.java.frag

10
mobile/android/base/widget/ThemedImageView.java.in
View File

@ -1,5 +1,5 @@
#filter substitution
#define VIEW_NAME_SUFFIX ImageView
#define BASE_TYPE android.widget.ImageView
#define STYLE_CONSTRUCTOR 1
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX ImageView
//#define BASE_TYPE android.widget.ImageView
//#define STYLE_CONSTRUCTOR 1
//#include ThemedView.java.frag

8
mobile/android/base/widget/ThemedLinearLayout.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
#define VIEW_NAME_SUFFIX LinearLayout
#define BASE_TYPE android.widget.LinearLayout
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX LinearLayout
//#define BASE_TYPE android.widget.LinearLayout
//#include ThemedView.java.frag

10
mobile/android/base/widget/ThemedRelativeLayout.java.in
View File

@ -1,5 +1,5 @@
#filter substitution
#define VIEW_NAME_SUFFIX RelativeLayout
#define BASE_TYPE android.widget.RelativeLayout
#define STYLE_CONSTRUCTOR 1
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX RelativeLayout
//#define BASE_TYPE android.widget.RelativeLayout
//#define STYLE_CONSTRUCTOR 1
//#include ThemedView.java.frag

8
mobile/android/base/widget/ThemedTextSwitcher.java.in
View File

@ -1,4 +1,4 @@
#filter substitution
#define VIEW_NAME_SUFFIX TextSwitcher
#define BASE_TYPE android.widget.TextSwitcher
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX TextSwitcher
//#define BASE_TYPE android.widget.TextSwitcher
//#include ThemedView.java.frag

10
mobile/android/base/widget/ThemedTextView.java.in
View File

@ -1,5 +1,5 @@
#filter substitution
#define VIEW_NAME_SUFFIX TextView
#define BASE_TYPE android.widget.TextView
#define STYLE_CONSTRUCTOR 1
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX TextView
//#define BASE_TYPE android.widget.TextView
//#define STYLE_CONSTRUCTOR 1
//#include ThemedView.java.frag

6
mobile/android/base/widget/ThemedView.java.frag
View File

@ -35,11 +35,11 @@ public class Themed@VIEW_NAME_SUFFIX@ extends @BASE_TYPE@
}
public Themed@VIEW_NAME_SUFFIX@(Context context, AttributeSet attrs, int defStyle) {
#ifdef STYLE_CONSTRUCTOR
//#ifdef STYLE_CONSTRUCTOR
super(context, attrs, defStyle);
#else
//#else
super(context, attrs);
#endif
//#endif
mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();

10
mobile/android/base/widget/ThemedView.java.in
View File

@ -1,5 +1,5 @@
#filter substitution
#define VIEW_NAME_SUFFIX View
#define BASE_TYPE android.view.View
#define STYLE_CONSTRUCTOR 1
#include ThemedView.java.frag
//#filter substitution
//#define VIEW_NAME_SUFFIX View
//#define BASE_TYPE android.view.View
//#define STYLE_CONSTRUCTOR 1
//#include ThemedView.java.frag