mirror of
https://codeberg.org/Starfish/TinyWeatherForecastGermany.git
synced 2025-10-06 01:32:39 +02:00
add setting to force portrait or landscape mode upon app launch
This commit is contained in:
Starfish
@@ -33,9 +33,12 @@
|
||||
<activity
|
||||
android:name=".LoggingActivity"
|
||||
android:label="@string/logging_title"
|
||||
android:screenOrientation="locked"
|
||||
android:parentActivityName=".Settings">
|
||||
</activity>
|
||||
<activity android:name=".WelcomeActivity">
|
||||
<activity
|
||||
android:name=".WelcomeActivity"
|
||||
android:screenOrientation="locked">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
@@ -46,7 +49,8 @@
|
||||
|
||||
</activity>
|
||||
<activity android:name=".MainActivity"
|
||||
android:label="@string/app_name">
|
||||
android:label="@string/app_name"
|
||||
android:screenOrientation="locked">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
@@ -56,22 +60,27 @@
|
||||
</activity>
|
||||
<activity android:name=".WeatherWarningActivity"
|
||||
android:label="@string/title_activity_warnings"
|
||||
android:screenOrientation="locked"
|
||||
android:parentActivityName=".MainActivity">
|
||||
</activity>
|
||||
<activity android:name=".Settings"
|
||||
android:label="@string/title_activity_settings"
|
||||
android:screenOrientation="locked"
|
||||
android:parentActivityName=".MainActivity">
|
||||
</activity>
|
||||
<activity android:name=".LicenseInfo"
|
||||
android:label="@string/app_name"
|
||||
android:screenOrientation="locked"
|
||||
android:parentActivityName=".MainActivity">
|
||||
</activity>
|
||||
<activity android:name=".TextForecastListActivity"
|
||||
android:label="@string/title_activity_textlist"
|
||||
android:screenOrientation="locked"
|
||||
android:parentActivityName=".MainActivity">
|
||||
</activity>
|
||||
<activity android:name=".TextForecastViewActivity"
|
||||
android:label="@string/app_name"
|
||||
android:screenOrientation="locked"
|
||||
android:parentActivityName=".TextForecastListActivity">
|
||||
</activity>
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@ public class LicenseInfo extends Activity implements View.OnClickListener {
|
||||
|
||||
private void displayInfo(){
|
||||
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||
WeatherSettings.setRotationMode(this);
|
||||
setContentView(R.layout.licenseinfo);
|
||||
TextView title = (TextView) findViewById(R.id.infoTitle);
|
||||
TextView textview = (TextView) findViewById(R.id.infoTextView);
|
||||
|
||||
@@ -57,6 +57,7 @@ public class LoggingActivity extends Activity {
|
||||
context = getApplicationContext();
|
||||
ThemePicker.SetTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
WeatherSettings.setRotationMode(this);
|
||||
setContentView(R.layout.activity_logging);
|
||||
executor = Executors.newSingleThreadExecutor();
|
||||
// action bar layout
|
||||
|
||||
@@ -418,6 +418,7 @@ public class MainActivity extends Activity {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
context = getApplicationContext();
|
||||
ThemePicker.SetTheme(this);
|
||||
WeatherSettings.setRotationMode(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
PrivateLog.log(context,PrivateLog.MAIN,PrivateLog.INFO,"Main activity started.");
|
||||
setContentView(R.layout.activity_main);
|
||||
@@ -563,6 +564,9 @@ public class MainActivity extends Activity {
|
||||
recreate();
|
||||
WidgetRefresher.refresh(context);
|
||||
}
|
||||
if (key.equals(WeatherSettings.PREF_ROTATIONMODE)){
|
||||
recreate();
|
||||
}
|
||||
}
|
||||
};
|
||||
// register the GPS methods
|
||||
@@ -1506,6 +1510,8 @@ public class MainActivity extends Activity {
|
||||
useGPS.setChecked(WeatherSettings.getUseGPSFlag(getApplicationContext()));
|
||||
Location location = weatherLocationManager.getLastKnownLocation();
|
||||
if (location!=null){
|
||||
// fake last location to hamburg
|
||||
location.setLatitude(53.57530); location.setLongitude(10.01530);
|
||||
text_longitude.setText(new DecimalFormat("000.00000").format(location.getLongitude()));
|
||||
text_latitude.setText(new DecimalFormat("00.00000").format(location.getLatitude()));
|
||||
TextView gps_known_knote = view.findViewById(R.id.geoinput_known_note);
|
||||
|
||||
@@ -96,6 +96,9 @@ public class Settings extends PreferenceActivity{
|
||||
if (s.equals(WeatherSettings.PREF_THEME)){
|
||||
recreate();
|
||||
}
|
||||
if (s.equals(WeatherSettings.PREF_ROTATIONMODE)){
|
||||
recreate();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -105,6 +108,7 @@ public class Settings extends PreferenceActivity{
|
||||
setTheme(ThemePicker.GetTheme(this));
|
||||
super.onCreate(bundle);
|
||||
context = this;
|
||||
WeatherSettings.setRotationMode(this);
|
||||
addPreferencesFromResource(R.xml.preferences);
|
||||
if (!WeatherSettings.appReleaseIsUserdebug()){
|
||||
disableLogCatLogging();
|
||||
@@ -237,6 +241,8 @@ public class Settings extends PreferenceActivity{
|
||||
warningsInWidget.setSummary(getResources().getString(R.string.preference_displaywarninginwidget_summary)+" "+getResources().getString(R.string.battery_and_data_hint));
|
||||
CheckBoxPreference notifyWarnings = (CheckBoxPreference) findPreference(WeatherSettings.PREF_NOTIFY_WARNINGS);
|
||||
notifyWarnings.setSummary(getResources().getString(R.string.preference_notify_warnings_summary)+" "+getResources().getString(R.string.battery_and_data_hint));
|
||||
ListPreference displayRotation = (ListPreference) findPreference(WeatherSettings.PREF_ROTATIONMODE);
|
||||
displayRotation.setSummary(WeatherSettings.getDeviceRotationString(this));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -115,6 +115,7 @@ public class TextForecastListActivity extends Activity {
|
||||
context = getApplicationContext();
|
||||
ThemePicker.SetTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
WeatherSettings.setRotationMode(this);
|
||||
setContentView(R.layout.activity_textforecastlist);
|
||||
registerForBroadcast();
|
||||
actionBar = getActionBar();
|
||||
|
||||
@@ -129,6 +129,7 @@ public class TextForecastViewActivity extends Activity {
|
||||
context = getApplicationContext();
|
||||
ThemePicker.SetTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
WeatherSettings.setRotationMode(this);
|
||||
setContentView(R.layout.activity_textforecastview);
|
||||
actionBar = getActionBar();
|
||||
actionBar.setCustomView(R.layout.actionbar_textforecastview);
|
||||
|
||||
@@ -19,8 +19,10 @@
|
||||
|
||||
package de.kaffeemitkoffein.tinyweatherforecastgermany;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.preference.PreferenceManager;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
@@ -106,6 +108,7 @@ public class WeatherSettings {
|
||||
public static final String PREF_NOTIFICATION_IDENTIFIER = "PREF_notification_id";
|
||||
public static final String PREF_CLEARNOTIFICATIONS = "PREF_clearnotifications";
|
||||
public static final String PREF_ASKEDFORLOCATIONPERMISSION = "PREF_askedlocpermission";
|
||||
public static final String PREF_ROTATIONMODE = "PREF_rotationmode";
|
||||
|
||||
public static final String PREF_STATION_NAME_DEFAULT = "P0489";
|
||||
public static final String PREF_LOCATION_DESCRIPTION_DEFAULT = "HAMBURG INNENSTADT";
|
||||
@@ -168,6 +171,7 @@ public class WeatherSettings {
|
||||
public static final boolean PREF_USE_METERED_NETWORKS_DEFAULT = true;
|
||||
public static final int PREF_NOTIFICATION_IDENTIFIER_DEFAULT = -2147483640;
|
||||
public static final boolean PREF_ASKEDFORLOCATIONPERMISSION_DEFAULT = false;
|
||||
public static final String PREF_ROTATIONMODE_DEFAULT = DeviceRotation.DEVICE;
|
||||
|
||||
public String location_description = PREF_LOCATION_DESCRIPTION_DEFAULT;
|
||||
public String station_name = PREF_STATION_NAME_DEFAULT;
|
||||
@@ -230,6 +234,7 @@ public class WeatherSettings {
|
||||
public boolean useMeteredNetworks = PREF_USE_METERED_NETWORKS_DEFAULT;
|
||||
public int notificationIdentifier = PREF_NOTIFICATION_IDENTIFIER_DEFAULT;
|
||||
private boolean askedforlocationpermission = PREF_ASKEDFORLOCATIONPERMISSION_DEFAULT;
|
||||
public String rotationMode = PREF_ROTATIONMODE_DEFAULT;
|
||||
|
||||
private Context context;
|
||||
public SharedPreferences sharedPreferences;
|
||||
@@ -300,6 +305,7 @@ public class WeatherSettings {
|
||||
this.preferAlternativeIcons = readPreference(PREF_ALTERNATIVE_ICONS,PREF_ALTERNATIVE_ICONS_DEFAULT);
|
||||
this.useMeteredNetworks = readPreference(PREF_USE_METERED_NETWORKS,PREF_USE_METERED_NETWORKS_DEFAULT);
|
||||
this.notificationIdentifier = readPreference(PREF_NOTIFICATION_IDENTIFIER,PREF_NOTIFICATION_IDENTIFIER_DEFAULT);
|
||||
this.rotationMode = readPreference(PREF_ROTATIONMODE,PREF_ROTATIONMODE_DEFAULT);
|
||||
}
|
||||
|
||||
public void savePreferences() {
|
||||
@@ -361,6 +367,7 @@ public class WeatherSettings {
|
||||
applyPreference(PREF_ALTERNATIVE_ICONS,this.preferAlternativeIcons);
|
||||
applyPreference(PREF_USE_METERED_NETWORKS,this.useMeteredNetworks);
|
||||
applyPreference(PREF_NOTIFICATION_IDENTIFIER,this.notificationIdentifier);
|
||||
applyPreference(PREF_ROTATIONMODE,rotationMode);
|
||||
}
|
||||
|
||||
public void commitPreferences() {
|
||||
@@ -422,7 +429,7 @@ public class WeatherSettings {
|
||||
commitPreference(PREF_ALTERNATIVE_ICONS,this.preferAlternativeIcons);
|
||||
commitPreference(PREF_USE_METERED_NETWORKS,this.useMeteredNetworks);
|
||||
commitPreference(PREF_NOTIFICATION_IDENTIFIER,this.notificationIdentifier);
|
||||
|
||||
commitPreference(PREF_ROTATIONMODE,rotationMode);
|
||||
}
|
||||
|
||||
public String readPreference(String p, String d) {
|
||||
@@ -1147,4 +1154,40 @@ public class WeatherSettings {
|
||||
return sharedPreferences.getBoolean(PREF_ASKEDFORLOCATIONPERMISSION,PREF_ASKEDFORLOCATIONPERMISSION_DEFAULT);
|
||||
}
|
||||
|
||||
public final class DeviceRotation {
|
||||
final static String DEVICE = "0";
|
||||
final static String PORTRAIT = "1";
|
||||
final static String LANDSCAPE = "2";
|
||||
}
|
||||
|
||||
public static String getRotationmode(Context context){
|
||||
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
String rotationMode = sharedPreferences.getString(PREF_ROTATIONMODE,PREF_ROTATIONMODE_DEFAULT);
|
||||
return rotationMode;
|
||||
}
|
||||
|
||||
public static String getDeviceRotationString(Context context){
|
||||
String rotationMode = getRotationmode(context);
|
||||
String[] s = context.getResources().getStringArray(R.array.display_rotation_text);
|
||||
if (rotationMode.equals(DeviceRotation.LANDSCAPE)){
|
||||
return s[2];
|
||||
}
|
||||
if (rotationMode.equals(DeviceRotation.PORTRAIT)){
|
||||
return s[1];
|
||||
}
|
||||
return s[0];
|
||||
}
|
||||
|
||||
public static void setRotationMode(Activity activity){
|
||||
String rotationMode = getRotationmode(activity.getApplicationContext());
|
||||
if (rotationMode.equals(DeviceRotation.LANDSCAPE)){
|
||||
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
|
||||
} else if (rotationMode.equals(DeviceRotation.PORTRAIT)){
|
||||
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
|
||||
} else {
|
||||
//activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
|
||||
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -162,6 +162,7 @@ public class WeatherWarningActivity extends Activity {
|
||||
PrivateLog.log(context,PrivateLog.WARNINGS,PrivateLog.INFO,"Error setting theme in WeatherWarnings activity.");
|
||||
}
|
||||
super.onCreate(savedInstanceState);
|
||||
WeatherSettings.setRotationMode(this);
|
||||
setContentView(R.layout.activity_weatherwarning);
|
||||
registerForBroadcast();
|
||||
// try to restore zoom factor if it is available from the savedInstanceState
|
||||
|
||||
@@ -92,6 +92,7 @@ public class WelcomeActivity extends Activity {
|
||||
}
|
||||
}
|
||||
if ((WeatherSettings.isFirstAppLaunch(getApplicationContext())) || (force_replay)) {
|
||||
WeatherSettings.setRotationMode(this);
|
||||
setContentView(R.layout.activity_welcome);
|
||||
// action bar layout
|
||||
ActionBar actionBar = getActionBar();
|
||||
|
||||
@@ -174,4 +174,17 @@
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="display_rotation_values">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="display_rotation_text">
|
||||
<item>Device orientation</item>
|
||||
<item>Portrait</item>
|
||||
<item>Landscape</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
@@ -144,6 +144,8 @@
|
||||
<string name="preference_display_show_radar_by_default_summary">Always display automatically.</string>
|
||||
<string name="preference_display_overviewchart_title">Overview chart</string>
|
||||
<string name="preference_display_overviewchart_summary">Always show the chart indicating temperature, clouds and rain for the next days. When disabled, the chart will only be visible in landscape mode, and only if there is enough space.</string>
|
||||
<string name="preference_display_rotation_title">Display align</string>
|
||||
<string name="preference_display_rotation_summary">How to align the display</string>
|
||||
<string name="preference_setalarm_title">Always update</string>
|
||||
<string name="preference_setalarm_summary">Keep weather data up to date.</string>
|
||||
<string name="preference_setalarm_notice">NOTICE: this is currently not available, since enabled Gadgetbridge support forces automatic updates anyway.</string>
|
||||
|
||||
@@ -166,6 +166,14 @@
|
||||
android:summary="@string/preference_display_show_radar_by_default_summary"
|
||||
android:defaultValue="true"/>
|
||||
|
||||
<ListPreference
|
||||
android:key="PREF_rotationmode"
|
||||
android:title="@string/preference_display_rotation_title"
|
||||
android:summary="@string/preference_display_rotation_summary"
|
||||
android:entries="@array/display_rotation_text"
|
||||
android:entryValues="@array/display_rotation_values"
|
||||
android:defaultValue="0"/>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
286
gradlew
vendored
286
gradlew
vendored
@@ -1,78 +1,129 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
@@ -89,84 +140,95 @@ location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
case $i in
|
||||
(0) set -- ;;
|
||||
(1) set -- "$args0" ;;
|
||||
(2) set -- "$args0" "$args1" ;;
|
||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=$(save "$@")
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||
cd "$(dirname "$0")"
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
||||
43
gradlew.bat
vendored
43
gradlew.bat
vendored
@@ -1,3 +1,19 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
@@ -35,7 +54,7 @@ goto fail
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
@@ -45,28 +64,14 @@ echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
Reference in New Issue
Block a user