September 2006 - Wine-Commits

Alexandre Julliard : makefiles: Attempt to automatically run make depend when reading an updated makefile.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

Module: wine Branch: master Commit: 8598a4c6007e4197b5a382f52438731904244794 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8598a4c6007e4197b5a382f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 09:40:00 2006 +0200 makefiles: Attempt to automatically run make depend when reading an updated makefile. --- Make.rules.in | 8 +------- Makefile.in | 16 ++++++++++++++-- configure | 5 +++++ configure.ac | 5 +++++ tools/Makefile.in | 2 ++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 894c377..9e7ec07 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -179,7 +179,7 @@ # Implicit rules # 'all' target first in case the enclosing Makefile didn't define any target -all: Makefile +all: filter: dummy @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all @@ -193,12 +193,6 @@ # Rules for resources $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(IDL_TLB_SRCS:.idl=.tlb) -# Rules for makefile - -Makefile: Makefile.in $(TOPSRCDIR)/configure - @echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure - @exit 1 - # Rule for linting $(MODULE).ln : $(LINTS) diff --git a/Makefile.in b/Makefile.in index 72ee32e..df64bf0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -103,10 +103,22 @@ fonts/__install__ loader/__install__ ser programs/__install__: libs tools include dlls/__install-lib__ tools/__install-lib__ tools/__install-dev__: tools -depend $(SUBDIRS:%=%/__depend__): $(MAKEDEP) +RECURSE_TARGETS = \ + $(SUBDIRS) \ + $(SUBDIRS:%=%/__clean__) \ + $(SUBDIRS:%=%/__depend__) \ + $(SUBDIRS:%=%/__install-dev__) \ + $(SUBDIRS:%=%/__install-lib__) \ + $(SUBDIRS:%=%/__install__) \ + $(SUBDIRS:%=%/__uninstall__) \ + $(TESTSUBDIRS:%=%/__crosstest__) \ + $(TESTSUBDIRS:%=%/__test__) \ + $(TESTSUBDIRS:%=%/__testclean__) + +depend $(RECURSE_TARGETS): $(MAKEDEP) $(MAKEDEP): - @cd $(TOOLSDIR)/tools && $(MAKE) makedep + @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(EXEEXT) # Test rules diff --git a/configure b/configure index e153f2f..3838f92 100755 --- a/configure +++ b/configure @@ -23765,6 +23765,11 @@ esac DEPENDENCIES="### Dependencies: +.INIT: Makefile +.BEGIN: Makefile +Makefile: dummy + -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + \$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 229cecd..0c1322a 100644 --- a/configure.ac +++ b/configure.ac @@ -1459,6 +1459,11 @@ dnl **** Generate output files **** AC_SUBST(DEPENDENCIES,"### Dependencies: +.INIT: Makefile +.BEGIN: Makefile +Makefile: dummy + -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + \$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)") diff --git a/tools/Makefile.in b/tools/Makefile.in index 111d605..14ded8a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -95,3 +95,5 @@ uninstall:: -$(UPDATE_DESKTOP_DATABASE) @DEPENDENCIES@ # everything below this line is overwritten by make depend + +Makefile: makedep$(EXEEXT)

1 0

Alexandre Julliard : makefiles: Generate the dependencies line to avoid some code duplication.
by Alexandre Julliard Sept. 14, 2006

Sept. 14, 2006

1 0

lostwages/templates/en download.template
by Jeremy Newman Sept. 13, 2006

Sept. 13, 2006

ChangeSet ID: 28059 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/13 16:50:32 Modified files: templates/en : download.template Log message: update codeweavers blurb Patch: http://cvs.winehq.org/patch.py?id=28059 Old revision New revision Changes Path 1.86 1.87 +4 -3 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.86 lostwages/templates/en/download.template:1.87 --- lostwages/templates/en/download.template:1.86 13 Sep 2006 21:50:32 -0000 +++ lostwages/templates/en/download.template 13 Sep 2006 21:50:32 -0000 @@ -173,9 +173,10 @@ for post-installation instructions.< </td> <td align=left bgcolor="#ffffff"> <a href="http://www.codeweavers.com/products/">CrossOver</a> - - Award winning highly customized version with installer. Easy to use GUI tools to configure to work with - supported applications such as Microsoft® Office. Email support available after purchase. - Multi-user server version also available. <a href="http://www.codeweavers.com/products/download_trial/">Evaluation versions available</a>. + Award winning highly customized versions for Mac OS X and Linux. Easy to use GUI tools to configure to work with + supported applications such as Microsoft® Office, Adobe® Photoshop, Lotus Notes®, + and DirectX/OpenGL games. Email support available after purchase. Multi-user server version also available. + <a href="http://www.codeweavers.com/products/download_trial/">Evaluation versions available</a>. By <a href="http://www.codeweavers.com/">CodeWeavers</a>. </td> </tr>

1 0

lostwages/images cw_logo.png distro/crossover.png
by Jeremy Newman Sept. 13, 2006

Sept. 13, 2006

ChangeSet ID: 28058 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/13 16:46:44 Modified files: images : cw_logo.png images/distro : crossover.png Log message: updated CodeWeavers and CrossOver logos Patch: http://cvs.winehq.org/patch.py?id=28058 Old revision New revision Changes Path 1.2 1.3 +8 -17 lostwages/images/cw_logo.png 1.1 1.2 +13 -16 lostwages/images/distro/crossover.png

1 0

lostwages/images/bannerads cw-ad06.png
by Jeremy Newman Sept. 13, 2006

Sept. 13, 2006

ChangeSet ID: 28057 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/13 16:46:26 Added files: images/bannerads: cw-ad06.png Log message: added new add Patch: http://cvs.winehq.org/patch.py?id=28057 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/bannerads/cw-ad06.png

1 0

lostwages/ bin/ad images/bannerads/cw-ad01.gif ...
by Jeremy Newman Sept. 13, 2006

Sept. 13, 2006

ChangeSet ID: 28056 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/13 16:45:55 Modified files: bin : ad Removed files: images/bannerads: cw-ad01.gif cw-ad01.xml cw-ad02.gif cw-ad02.xml cw-ad03.gif cw-ad03.xml cw-ad04.gif cw-ad04.xml cw-ad05.gif cw-ad05.xml Log message: updated banner ads Patch: http://cvs.winehq.org/patch.py?id=28056 Old revision New revision Changes Path 1.2 1.3 +5 -71 lostwages/bin/ad 1.1 Removed +0 -0 lostwages/images/bannerads/cw-ad01.gif 1.4 Removed +0 -0 lostwages/images/bannerads/cw-ad01.xml 1.4 Removed +0 -0 lostwages/images/bannerads/cw-ad02.gif 1.4 Removed +0 -0 lostwages/images/bannerads/cw-ad02.xml 1.1 Removed +0 -0 lostwages/images/bannerads/cw-ad03.gif 1.1 Removed +0 -0 lostwages/images/bannerads/cw-ad03.xml 1.1 Removed +0 -0 lostwages/images/bannerads/cw-ad04.gif 1.3 Removed +0 -0 lostwages/images/bannerads/cw-ad04.xml 1.1 Removed +0 -0 lostwages/images/bannerads/cw-ad05.gif 1.1 Removed +0 -0 lostwages/images/bannerads/cw-ad05.xml Index: lostwages/bin/ad diff -u -p lostwages/bin/ad:1.2 lostwages/bin/ad:1.3 --- lostwages/bin/ad:1.2 13 Sep 2006 21:45:55 -0000 +++ lostwages/bin/ad 13 Sep 2006 21:45:55 -0000 @@ -3,74 +3,8 @@ /* Banner Ad Code */ /* For WineHQ */ -// path for banner ad -$bannerads_path = '../images/bannerads/'; - -// base filename of the static ad -$fixed_ad = 'cw-ad02'; - -// max count until we fix on static ad -$max_ads = 50; - -// open file and display contents of selected tag (very simple) -function get_xml_tags ($file, $tags = null) -{ - if (is_array($tags) and file_exists($file)) - { - $content = array(); - $fp = @fopen($file, "r"); - $data = fread($fp, filesize($file)); - @fclose($fp); - foreach ($tags as $tag) - { - if (eregi("<" . $tag . ">(.*)</" . $tag . ">", $data, $out)) - { - array_push($content, $out[1]); - } - } - return $content; - } - else - { - return null; - } -} -// end get_xml_tags() - -// check cookie for ad counter -$whqac = 1; -if (isset($_COOKIE['whqac'])) - $whqac = $_COOKIE['whqac']; -unset($_COOKIE["whqac"]); -$whqac++; - -// randomly select a banner and display it -if ($whqac >= $max_ads) -{ - // display fixed ad - $whqac = $max_ads; - $img = $fixed_ad; -} -else -{ - // display random ad - $ads = array(); - $d = opendir($bannerads_path); - while($entry = readdir($d)) - { - if(!ereg("(.+)\\.gif$", $entry, $arr)) - continue; - array_push($ads, $arr[1]); - } - closedir($d); - sort($ads); - $img = $ads[(rand(1,count($ads))-1)]; -} -list($url, $alt) = get_xml_tags($bannerads_path.$img.'.xml', array('url', 'alt')); - // da banner -setcookie("whqac", $whqac, time()+60*60*24*365); -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Expires: Mon, 1 Jan 2006 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); @@ -79,9 +13,9 @@ header("Pragma: no-cache"); <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title><?=$alt?></title> + <title>Banner Ad</title> </head> -<body bgcolor="#000000" text="#FFFFFF" marginwidth="0" marginheight="0" style="margin:0px;"><a href="<?=$url?>" -target="_top"><img src="../images/bannerads/<?=$img?>.gif" -width="468" height="60" border="0" alt="<?=$alt?>" /></a> <?=$whqac?></body> +<body bgcolor="#FFFFFF" text="#000000" marginwidth="0" marginheight="0" style="margin:0px;"><a href="http://www.codeweavers.com/" +target="_top"><img src="../images/bannerads/cw-ad06.png" +width="468" height="60" border="0" alt="cw-ad06.png" /></a></body> </html> Index: lostwages/images/bannerads/cw-ad01.xml diff -u -p lostwages/images/bannerads/cw-ad01.xml:1.4 /dev/null --- lostwages/images/bannerads/cw-ad01.xml 13 Sep 2006 21:45:55 -0000 +++ /dev/null 13 Sep 2006 21:45:55 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/cxoffice/?ad=5</url> - <alt>QuickTime for Linux!</alt> -</ad> Index: lostwages/images/bannerads/cw-ad02.xml diff -u -p lostwages/images/bannerads/cw-ad02.xml:1.4 /dev/null --- lostwages/images/bannerads/cw-ad02.xml 13 Sep 2006 21:45:55 -0000 +++ /dev/null 13 Sep 2006 21:45:55 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/support_wine/?ad=21</url> - <alt>Support the Wine Project!</alt> -</ad> Index: lostwages/images/bannerads/cw-ad03.xml diff -u -p lostwages/images/bannerads/cw-ad03.xml:1.1 /dev/null --- lostwages/images/bannerads/cw-ad03.xml 13 Sep 2006 21:45:55 -0000 +++ /dev/null 13 Sep 2006 21:45:55 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad03</id> - <url>http://www.codeweavers.com/services/?ad=16</url> - <alt>CodeWeavers can port your Windows application with Wine</alt> -</ad> Index: lostwages/images/bannerads/cw-ad04.xml diff -u -p lostwages/images/bannerads/cw-ad04.xml:1.3 /dev/null --- lostwages/images/bannerads/cw-ad04.xml 13 Sep 2006 21:45:55 -0000 +++ /dev/null 13 Sep 2006 21:45:55 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/cxoffice/?ad=5</url> - <alt>Microsoft Office On Linux!</alt> -</ad> Index: lostwages/images/bannerads/cw-ad05.xml diff -u -p lostwages/images/bannerads/cw-ad05.xml:1.1 /dev/null --- lostwages/images/bannerads/cw-ad05.xml 13 Sep 2006 21:45:55 -0000 +++ /dev/null 13 Sep 2006 21:45:55 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad05</id> - <url>http://www.codeweavers.com/about/?ad=18</url> - <alt>Professional Support for Wine!</alt> -</ad>

1 0

lostwages/news 2006091301.xml
by WineHQ Sept. 13, 2006

Sept. 13, 2006

ChangeSet ID: 28055 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/09/13 15:43:21 Added files: news : 2006091301.xml Log message: News about Wine 0.9.21 Patch: http://cvs.winehq.org/patch.py?id=28055 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006091301.xml Index: lostwages/news/2006091301.xml diff -u -p /dev/null lostwages/news/2006091301.xml:1.1 --- /dev/null 13 Sep 2006 20:43:21 -0000 +++ lostwages/news/2006091301.xml 13 Sep 2006 20:43:21 -0000 @@ -0,0 +1,28 @@ +<news> + <date>September 13, 2006</date> + <title>Wine 0.9.21 Released</title> + <body> + +Wine 0.9.21 came out today and includes the following enhancements: + +<ul> +<li> OpenGL restructurations.</li> +<li> The usual assortment of MSI improvements.</li> +<li> Several Richedit fixes.</li> +<li> WCMD Winelib app renamed to CMD for compatibility.</li> +<li> Many improvements to the Wintrust DLL.</li> +<li> Some code cleanups.</li> +</ul> + + + Binary packages are in the process of being built and it may take a few days + for them to appear, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.21.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.125">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + + </body> +</news>

1 0

lostwages/include winehq.conf
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

ChangeSet ID: 28054 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/09/13 14:50:43 Modified files: include : winehq.conf Log message: Release 0.9.21 Patch: http://cvs.winehq.org/patch.py?id=28054 Old revision New revision Changes Path 1.43 1.44 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.43 lostwages/include/winehq.conf:1.44 --- lostwages/include/winehq.conf:1.43 13 Sep 2006 19:50:43 -0000 +++ lostwages/include/winehq.conf 13 Sep 2006 19:50:43 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.20 +snapshot_date: 0.9.21 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

Tag wine-0.9.21 : Alexandre Julliard : Release 0.9.21
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: refs/tags/wine-0.9.21 Tag: b1b89ee861e56236c60e95660fcf992f71bcc340 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=b1b89ee861e56236c60e95660f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 21:10:25 2006 +0200 Release 0.9.21

1 0

Alexandre Julliard : Release 0.9.21.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: ebcf4a0e6884cd646fac3ae57e81fdbf5f5bb615 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebcf4a0e6884cd646fac3ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 21:10:25 2006 +0200 Release 0.9.21. --- ANNOUNCE | 17 - ChangeLog | 2073 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 2092 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ebcf4a0e6884cd646fa…

1 0