Module: wine Branch: master Commit: a33f4646cd8f3ac3b120871261c843d2f878ebef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33f4646cd8f3ac3b120871261...
Author: Austin English austinenglish@gmail.com Date: Tue Feb 28 00:19:10 2017 -0600
tools: Remove wineinstall.
Signed-off-by: Austin English austinenglish@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
README | 13 ++-- tools/wineinstall | 190 ------------------------------------------------------ 2 files changed, 7 insertions(+), 196 deletions(-)
diff --git a/README b/README index 1627081..b1ca54f 100644 --- a/README +++ b/README @@ -13,11 +13,11 @@ LICENSE for the details.
2. QUICK START
-Whenever you compile from source, it is recommended to use the Wine -Installer to build and install Wine. From the top-level directory -of the Wine source (which contains this file), run: +From the top-level directory of the Wine source (which contains this file), +run:
-./tools/wineinstall +./configure +make
Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and @@ -84,8 +84,7 @@ Optional support libraries:
4. COMPILATION
-In case you chose to not use wineinstall, run the following commands -to build Wine: +To build Wine, do:
./configure make @@ -97,6 +96,8 @@ Windows source code under Unix.
To see compile configuration options, do ./configure --help.
+For more information, see https://wiki.winehq.org/Building_Wine + 5. SETUP
Once Wine has been built correctly, you can do "make install"; this diff --git a/tools/wineinstall b/tools/wineinstall deleted file mode 100755 index e8e22bf..0000000 --- a/tools/wineinstall +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/sh -# WINE Installation script -# Can do almost everything from compiling to configuring... -# -# Copyright 1999 Ove Kåven -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# - -#--- defaults (change these if you are a packager) -CONFARGS="" # configure args, e.g. --prefix=/usr - -std_sleep() { - sleep 1 -} - -conf_yesno_answer() { - unset ANSWER - while [ "$ANSWER" != 'yes' ] && [ "$ANSWER" != 'no' ] - do { - echo -n "$1" - read ANSWER - } - done -} - -# startup... - -echo "Wine Installer v1.0" -echo - -if [ ! -f configure ] -then - if [ -f ../configure ] - then { - cd .. - } - else { - echo "You're running this from the wrong directory." - echo "Change to the Wine source's main directory and try again." - exit 1 - } - fi -fi - -if [ -w / ] -then - echo "You are running wineinstall as root, this is not advisable. Please rerun as a user." - echo "Aborting." - exit 1 -fi - -if [ ! -w . ] -then - echo "The source directory is not writable. You probably extracted the sources as root." - echo "You should remove the source tree and extract it again as a normal user." - exit 1 -fi - -# check whether RPM installed, and if it is, remove any old wine rpm. -if [ -x `which rpm 2>/dev/null` ]; then - if [ -n "`rpm -qi wine 2>/dev/null|grep "^Name"`" ]; then - echo "Warning: Old Wine RPM install detected. Do you want to remove it first?" - conf_yesno_answer "(yes/no) " - if [ "$ANSWER" = 'yes' ]; then - echo "We need to remove the rpm as root, please enter your root password" - echo - echo Starting wine rpm removal... - su -c "rpm -e wine; RET=$?" - if [ $RET -eq 0 ]; then - echo Done. - else - echo "FAILED. Probably you aren't installing as root." - echo "Expect problems (library conflicts with existing install etc.)." - fi - else - echo "Sorry, I won't install Wine when an rpm version is still installed." - echo "(Wine support suffered from way too many conflicts between RPM" - echo "and source installs)" - echo "Have a nice day !" - exit 1 - fi - fi -fi - -# check whether wine binary still available -if [ -x `which wine 2>/dev/null` ] && [ -n "`wine --version 2>/dev/null`" ] -then - echo "Warning !! wine binary (still) found, which may indicate" - echo "a (conflicting) previous installation." - echo "You might want to abort and uninstall Wine first." - echo "(If you previously tried to install from source manually, " - echo "run 'make uninstall' from the wine root directory)" - std_sleep -fi - -# Ask the user if they want to build and install Wine: -echo -echo "We need to install Wine as the root user. Do you want us to build Wine," -echo "'su root' and install Wine? Enter 'no' to build Wine without installing:" -conf_yesno_answer "(yes/no) " -ROOTINSTALL="$ANSWER" - -if [ "$ROOTINSTALL" = "yes" ] -then sucommand="make install" -fi - -# run the configure script, if necessary - -if [ -f Makefile ] -then - echo "I see that Wine has already been configured, so I'll skip that." - std_sleep -else - echo "Running configure..." - echo - if ! ./configure $CONFARGS - then { - echo - echo "Configure failed, aborting install." - exit 1 - } - fi -fi - -# Now do the compilation and (optionally) installation - -echo -echo "Compiling Wine. Grab a lunch or two, rent a video, or whatever," -echo "in the meantime..." -echo -std_sleep - -# try to just make wine, if this fails 'make depend' and try to remake -if ! { make; } -then - if ! { make depend && make; } - then - echo - echo "Compilation failed, aborting install." - exit 1 - fi -fi - -if [ "$ROOTINSTALL" = "no" ] -then - exit 0 -fi - -echo -echo "Performing 'make install' as root to install binaries, enter root password" - -if ! su root -c "$sucommand" -then - echo - echo "Incorrect root password. If you are running Ubuntu or a similar distribution," - echo "'make install' needs to be run via the sudo wrapper, so trying that one now" - if ! sudo su root -c "$sucommand" - then - echo - echo "Either you entered an incorrect password or we failed to" - echo "run '$sucommand' correctly." - echo "If you didn't enter an incorrect password then please" - echo "report this error and any steps to possibly reproduce it to" - echo "http://bugs.winehq.org/" - echo - echo "Installation failed, aborting." - exit 1 - fi -fi - -# it's a wrap -echo -echo "Installation complete." -echo "If you have problems with Wine, please read the documentation first," -echo "as many kinds of potential problems are explained there." - -exit 0