wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Alexandre Julliard : configure: Use the correct ar tool when building Mingw import libraries.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 2ffc7e2c2d9fd1a5384fc7d5705fe7ec8991c552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffc7e2c2d9fd1a5384fc7d57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 1 13:44:45 2007 +0100 configure: Use the correct ar tool when building Mingw import libraries. --- configure | 143 ++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 2 + dlls/Makedll.rules.in | 4 +- 3 files changed, 146 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a68d2d1..2bcd9ea 100755 --- a/configure +++ b/configure @@ -754,6 +754,7 @@ IMPLIBEXT LIBWINE_LDFLAGS DLLTOOL DLLWRAP +MINGWAR COREFOUNDATIONLIB IOKITLIB LDEXECFLAGS @@ -13437,6 +13438,102 @@ else DLLWRAP="$ac_cv_prog_DLLWRAP" fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MINGWAR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$MINGWAR"; then + ac_cv_prog_MINGWAR="$MINGWAR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MINGWAR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +MINGWAR=$ac_cv_prog_MINGWAR +if test -n "$MINGWAR"; then + { echo "$as_me:$LINENO: result: $MINGWAR" >&5 +echo "${ECHO_T}$MINGWAR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MINGWAR"; then + ac_ct_MINGWAR=$MINGWAR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_MINGWAR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_MINGWAR"; then + ac_cv_prog_ac_ct_MINGWAR="$ac_ct_MINGWAR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MINGWAR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_MINGWAR=$ac_cv_prog_ac_ct_MINGWAR +if test -n "$ac_ct_MINGWAR"; then + { echo "$as_me:$LINENO: result: $ac_ct_MINGWAR" >&5 +echo "${ECHO_T}$ac_ct_MINGWAR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_MINGWAR" = x; then + MINGWAR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + MINGWAR=$ac_ct_MINGWAR + fi +else + MINGWAR="$ac_cv_prog_MINGWAR" +fi + if test "$DLLWRAP" = "false"; then LIBEXT="a" else @@ -14245,6 +14342,49 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" + for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i386-mingw32-ar mingw32-ar mingw-ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MINGWAR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$MINGWAR"; then + ac_cv_prog_MINGWAR="$MINGWAR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MINGWAR="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +MINGWAR=$ac_cv_prog_MINGWAR +if test -n "$MINGWAR"; then + { echo "$as_me:$LINENO: result: $MINGWAR" >&5 +echo "${ECHO_T}$MINGWAR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$MINGWAR" && break +done +test -n "$MINGWAR" || MINGWAR="false" + if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi fi ;; @@ -21438,6 +21578,7 @@ IMPLIBEXT!$IMPLIBEXT$ac_delim LIBWINE_LDFLAGS!$LIBWINE_LDFLAGS$ac_delim DLLTOOL!$DLLTOOL$ac_delim DLLWRAP!$DLLWRAP$ac_delim +MINGWAR!$MINGWAR$ac_delim COREFOUNDATIONLIB!$COREFOUNDATIONLIB$ac_delim IOKITLIB!$IOKITLIB$ac_delim LDEXECFLAGS!$LDEXECFLAGS$ac_delim @@ -21460,7 +21601,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 92552d3..6fad99e 100644 --- a/configure.ac +++ b/configure.ac @@ -992,6 +992,7 @@ case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) AC_CHECK_TOOL(DLLWRAP,dllwrap,false) + AC_CHECK_TOOL(MINGWAR,ar,false) if test "$DLLWRAP" = "false"; then LIBEXT="a" else @@ -1104,6 +1105,7 @@ case $host_os in WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) + WINE_CHECK_MINGW_PROG(MINGWAR,ar,false) if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi fi ;; diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 632730f..fe77784 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -12,6 +12,7 @@ DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ IMPLIBEXT = @IMPLIBEXT@ +MINGWAR = @MINGWAR@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec @@ -56,8 +57,7 @@ lib$(BASEMODULE).def.a: $(IMPLIB_OBJS) lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS) $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) - $(AR) $@ $(IMPLIB_OBJS) - $(RANLIB) $@ + $(MINGWAR) rs $@ $(IMPLIB_OBJS) $(SUBDIRS): implib

1 0

Alexandre Julliard : configure: Added a generic macro for checking for Mingw programs.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: eae0dc23abed151196bc1488608bc1a96b289a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae0dc23abed151196bc14886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 1 13:14:21 2007 +0100 configure: Added a generic macro for checking for Mingw programs. --- aclocal.m4 | 12 ++++++++++++ configure.ac | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 82fb19d..32163fb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -131,6 +131,18 @@ else fi rm -f conf$$ conf$$.file]) +dnl **** Check for a mingw program, trying the various mingw prefixes **** +dnl +dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) +dnl +AC_DEFUN([WINE_CHECK_MINGW_PROG], +[AC_CHECK_PROGS([$1], + m4_foreach([ac_wine_prefix], + [i586-mingw32msvc, i386-mingw32msvc, i386-mingw32, mingw32, mingw], + [ac_wine_prefix-$2 ]), + [$3],[$4])]) + + dnl **** Create nonexistent directories from config.status **** dnl dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname) diff --git a/configure.ac b/configure.ac index d56250f..92552d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1101,9 +1101,9 @@ case $host_os in AC_SUBST(CROSSTEST,"") if test "$cross_compiling" = "no" then - AC_CHECK_PROGS(CROSSCC,i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc,false) - AC_CHECK_PROGS(DLLTOOL,i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool,false) - AC_CHECK_PROGS(CROSSWINDRES,i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres,false) + WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) + WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) + WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi fi ;;

1 0

appdb/ include/note.php tables/appdb_tables.sql
by WineHQ 02 Jan '07

02 Jan '07

ChangeSet ID: 30846 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/01 22:44:27 Modified files: include : note.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix the note deletion mail so it displays the information it is supposed to. Patch: http://cvs.winehq.org/patch.py?id=30846 Old revision New revision Changes Path 1.19 1.20 +11 -5 appdb/include/note.php 1.26 1.27 +2 -0 appdb/tables/appdb_tables.sql Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.19 appdb/include/note.php:1.20 --- appdb/include/note.php:1.19 2 Jan 2007 4:44:27 -0000 +++ appdb/include/note.php 2 Jan 2007 4:44:27 -0000 @@ -22,6 +22,8 @@ class Note { var $iVersionId; var $sTitle; var $sDescription; + var $iSubmitterId; + var $sSubmitTime; /** * Constructor. @@ -44,6 +46,8 @@ class Note { $this->iVersionId = $oRow->versionId; $this->sTitle = $oRow->noteTitle; $this->sDescription = $oRow->noteDesc; + $this->sSubmitTime = $oRow->submitTime; + $this->iSubmitterId = $oRow->submitterId; } } } @@ -56,9 +60,9 @@ class Note { */ function create() { - $hResult = query_parameters("INSERT INTO appNotes (versionId, noteTitle, noteDesc) ". - "VALUES('?', '?', '?')", - $this->iVersionId, $this->sTitle, $this->sDescription); + $hResult = query_parameters("INSERT INTO appNotes (versionId, noteTitle, noteDesc, submitterId) ". + "VALUES('?', '?', '?', '?')", + $this->iVersionId, $this->sTitle, $this->sDescription, $_SESSION['current']->iUserId); if($hResult) { @@ -152,12 +156,14 @@ class Note { addmsg("Note modified.", "green"); break; case "delete": + $oSubmitter = new User($this->iSubmitterId); $sSubject = "Note ".$this->sTitle." for ".$sAppName." has been deleted by ".$_SESSION['current']->sRealname; - $sMsg .= "This note was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n"; + $sMsg .= "This note was made on ".print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))." by ".$oSubmitter->sRealname."\n"; $sMsg .= "\n"; $sMsg .= "Subject: ".$this->sTitle."\n"; $sMsg .= "\n"; - $sMsg .= $this->sBody."\n"; + $sMsg .= "Note contents:\n"; + $sMsg .= $this->sDescription."\n"; $sMsg .= "\n"; $sMsg .= "Because:\n"; if($aClean['sReplyText']) Index: appdb/tables/appdb_tables.sql diff -u -p appdb/tables/appdb_tables.sql:1.26 appdb/tables/appdb_tables.sql:1.27 --- appdb/tables/appdb_tables.sql:1.26 2 Jan 2007 4:44:27 -0000 +++ appdb/tables/appdb_tables.sql 2 Jan 2007 4:44:27 -0000 @@ -168,6 +168,8 @@ create table appNotes ( noteTitle varchar(255), noteDesc text, versionId int not null, + submitterId int not null, + submitTime timestamp not null, key(noteId) );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007