Module: wine Branch: master Commit: 6359de3ddc683719930971b3386c90bb5ac6fa95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6359de3ddc683719930971b338...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Apr 21 12:17:00 2010 +0200
tools: Remove the deprecated wineprefixcreate script.
---
.gitignore | 2 - tools/Makefile.in | 16 +---- tools/wineprefixcreate.in | 141 ----------------------------------------- tools/wineprefixcreate.man.in | 82 ------------------------ 4 files changed, 4 insertions(+), 237 deletions(-)
diff --git a/.gitignore b/.gitignore index 793bf5a..007c8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -280,8 +280,6 @@ tools/winegcc/winegcc tools/winegcc/winegcc.man tools/winemaker.de.man tools/winemaker.man -tools/wineprefixcreate -tools/wineprefixcreate.man tools/wmc/mcy.tab.c tools/wmc/mcy.tab.h tools/wmc/wmc diff --git a/tools/Makefile.in b/tools/Makefile.in index 526ac1b..39209f9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,13 +15,11 @@ PROGRAMS = \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wine.inf \ - wineapploader \ - wineprefixcreate + wineapploader
MANPAGES = \ winemaker.man \ - winemaker.de.man \ - wineprefixcreate.man + winemaker.de.man
C_SRCS = \ fnt2bdf.c \ @@ -70,15 +68,9 @@ wine.inf: wine.inf.in wineapploader: wineapploader.in sed -e 's,@bindir@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
-wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) - sed -e "s,@bintodlldir@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) - chmod +x wineprefixcreate - -install install-lib:: wine.inf wineprefixcreate $(INSTALLDIRS) - $(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate +install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop - $(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE)
install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -87,7 +79,7 @@ install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)
uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop + $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE)
depend: makedep$(EXEEXT) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in deleted file mode 100644 index 5612dfd..0000000 --- a/tools/wineprefixcreate.in +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# -# Script to create the initial WINEPREFIX directory -# -# Copyright 1999 Ove Kåven -# Copyright 2004 Chris Morgan -# Copyright 2004 Alexandre Julliard -# -# 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 -# - -usage() -{ - echo "Usage: $0 [options]" - echo "" - echo "Options:" - echo " -h, --help Display this message" - echo " --prefix <dir> Directory to create (default: $WINEPREFIX or ~/.wine)" - echo " -q, --quiet Don't print status messages" - echo " -w, --wait Wait for the wineserver to exit before returning" - echo "" -} - -set -e - -bindir="" -case "$0" in - */*) - # $0 contains a path, use it - bindir=`dirname "$0"` - ;; - *) - # no directory in $0, search in PATH - saved_ifs=$IFS - IFS=: - for d in $PATH - do - IFS=$saved_ifs - if [ -x "$d/$0" ] - then - bindir="$d" - break - fi - done - ;; -esac - -bindir=`cd "$bindir" && pwd` -dlldir="$bindir/@bintodlldir@" - -do_wait=0 -quiet=0 - -if [ ! -f "$dlldir/ntdll.dll.so" -a \ - -x "$bindir/../server/wineserver" -a \ - -f "$bindir/../dlls/ntdll/ntdll.dll.so" ] -then - # running from the wine source tree - topdir=`cd "$bindir/.." && pwd` - WINELOADER="$topdir/wine" - WINESERVER="$topdir/server/wineserver" - if [ -n "$LD_LIBRARY_PATH" ] - then - LD_LIBRARY_PATH="$topdir/libs/wine:$LD_LIBRARY_PATH" - else - LD_LIBRARY_PATH="$topdir/libs/wine" - fi - export LD_LIBRARY_PATH -fi - -while [ $# -gt 0 ] -do - case "$1" in - -h|--help) - usage - exit 0 - ;; - --prefix) - WINEPREFIX="$2" - shift 2 - ;; - -q|--quiet) - quiet=1 - shift - ;; - -w|--wait) - do_wait=1 - shift - ;; - --use-wine-tree) - # ignored, autodetected now - shift 2 - ;; - *) - echo "Unknown option $1" - usage - exit 1 - ;; - esac -done - -echo "Note: wineprefixcreate is deprecated and shouldn't be needed anymore." 1>&2 -echo " WINEPREFIX creation and updates now happen automatically when needed." 1>&2 -echo 1>&2 - -WINEPREFIX="${WINEPREFIX:-$HOME/.wine}" - -if [ -d "$WINEPREFIX" ] || mkdir "$WINEPREFIX"; then : -else - echo "Could not create $WINEPREFIX, aborting" - exit 1 -fi - -WINEPREFIX=`cd "$WINEPREFIX" && pwd` -export WINEPREFIX - -if [ -d "$WINEPREFIX/dosdevices" ] -then - "${WINELOADER:-$bindir/wine}" wineboot.exe --update -else - "${WINELOADER:-$bindir/wine}" wineboot.exe -fi - -# Wait for the wineserver to finish - -if [ $do_wait = 1 ] -then - "${WINESERVER:-$bindir/wineserver}" -w -fi diff --git a/tools/wineprefixcreate.man.in b/tools/wineprefixcreate.man.in deleted file mode 100644 index bc98696..0000000 --- a/tools/wineprefixcreate.man.in +++ /dev/null @@ -1,82 +0,0 @@ -." -*- nroff -*- -.TH WINEPREFIXCREATE 1 "August 2006" "@PACKAGE_STRING@" "Windows on Unix" -.SH NAME -wineprefixcreate - create or update the Wine configuration -.SH SYNOPSIS -.BI wineprefixcreate\ [options] -.SH DESCRIPTION -.B wineprefixcreate -creates or updates a Wine configuration directory. When running Wine, -the base name of the configuration directory is specified in the -WINEPREFIX variable, hence the name of this tool. -.PP -.B wineprefixcreate -is launched automatically by -.BR wine (1) -if you don't have an existing configuration. However, it can sometimes -be useful to run it explicitly to create a different directory, or -update an existing one. -.SH OPTIONS -.TP -.BI --prefix\ directory -Create the specified directory (or update it if it exists already). If -this option is not specified, -.B wineprefixcreate -defaults to the -.I WINEPREFIX -environment variable, or to -.I $HOME/.wine -if not set. -.TP -.BR -h ", " --help -Display a usage message. -.TP -.BR -q ", " --quiet -Don't display any status messages. -.TP -.BR -w ", " --wait -Wait for -.B wineserver -to save everything before returning. This is necessary for instance if -you are planning to rename the directory once created; otherwise a -running server could still try to access the directory under its old -name. -.SH ENVIRONMENT VARIABLES -.TP -.I WINEPREFIX -If set, the content of this variable is taken as the name of the directory where -.B wineprefixcreate -stores its data (the default is \fI$HOME/.wine\fR). All -.B wine -processes using the same prefix share certain things like registry, -shared memory and kernel objects. By setting -.I WINEPREFIX -to different values for different Wine processes, it is possible to -run a number of truly independent Wine sessions. -.SH FILES -.TP -.B ~/.wine -Default location for the -.B wine -configuration data. -.SH AUTHORS -Many people have contributed to the development of Wine. Please check -the file Changelog in the Wine distribution for the complete details. -.SH BUGS -If you find a bug, please submit a bug report at -.UR http://bugs.winehq.org -.BR http://bugs.winehq.org . -.UE -.SH AVAILABILITY -.B wineprefixcreate -is part of the Wine distribution, which is available through WineHQ, -the Wine development headquarters, at -.UR http://www.winehq.org/ -.BR http://www.winehq.org/ . -.UE -.br -It is distributed under the terms of the GNU Lesser General Public -License. -.SH "SEE ALSO" -.BR wine (1), -.BR wineserver (1).