From 960cdf29197bc3f5922110cf26627aa9709ac79b Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Fri, 10 Jun 2005 10:29:11 +0000 Subject: This commit was manufactured by cvs2svn to create branch 'bogue40'. --- win/Copyright.rtf | 40 - win/InstallerIcons/Banner.bmp | Bin 94554 -> 0 bytes win/InstallerIcons/Complete.ico | Bin 2998 -> 0 bytes win/InstallerIcons/Custom.ico | Bin 2998 -> 0 bytes win/InstallerIcons/Dialog.bmp | Bin 79246 -> 0 bytes win/InstallerIcons/Exclam.ico | Bin 766 -> 0 bytes win/InstallerIcons/Info.ico | Bin 1078 -> 0 bytes win/InstallerIcons/New.ico | Bin 318 -> 0 bytes win/InstallerIcons/Remove.ico | Bin 2998 -> 0 bytes win/InstallerIcons/Repair.ico | Bin 2998 -> 0 bytes win/InstallerIcons/Typical.ico | Bin 2998 -> 0 bytes win/InstallerIcons/Up.ico | Bin 318 -> 0 bytes win/Tkzinc.wxs.in | 1579 --------------------------------------- win/WinPort.c | 1031 ------------------------- win/makefile.vc.in | 124 --- win/package.tcl | 320 -------- 16 files changed, 3094 deletions(-) delete mode 100644 win/Copyright.rtf delete mode 100644 win/InstallerIcons/Banner.bmp delete mode 100644 win/InstallerIcons/Complete.ico delete mode 100644 win/InstallerIcons/Custom.ico delete mode 100644 win/InstallerIcons/Dialog.bmp delete mode 100644 win/InstallerIcons/Exclam.ico delete mode 100644 win/InstallerIcons/Info.ico delete mode 100644 win/InstallerIcons/New.ico delete mode 100644 win/InstallerIcons/Remove.ico delete mode 100644 win/InstallerIcons/Repair.ico delete mode 100644 win/InstallerIcons/Typical.ico delete mode 100644 win/InstallerIcons/Up.ico delete mode 100644 win/Tkzinc.wxs.in delete mode 100644 win/WinPort.c delete mode 100644 win/makefile.vc.in delete mode 100644 win/package.tcl (limited to 'win') diff --git a/win/Copyright.rtf b/win/Copyright.rtf deleted file mode 100644 index a48ba8a..0000000 --- a/win/Copyright.rtf +++ /dev/null @@ -1,40 +0,0 @@ -{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1036\deflangfe1036{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} -{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f172\froman\fcharset238\fprq2 Times New Roman CE;}{\f173\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f175\froman\fcharset161\fprq2 Times New Roman Greek;} -{\f176\froman\fcharset162\fprq2 Times New Roman Tur;}{\f177\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f178\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f179\froman\fcharset186\fprq2 Times New Roman Baltic;} -{\f180\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f182\fswiss\fcharset238\fprq2 Arial CE;}{\f183\fswiss\fcharset204\fprq2 Arial Cyr;}{\f185\fswiss\fcharset161\fprq2 Arial Greek;}{\f186\fswiss\fcharset162\fprq2 Arial Tur;} -{\f187\fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f188\fswiss\fcharset178\fprq2 Arial (Arabic);}{\f189\fswiss\fcharset186\fprq2 Arial Baltic;}{\f190\fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f192\fmodern\fcharset238\fprq1 Courier New CE;} -{\f193\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f195\fmodern\fcharset161\fprq1 Courier New Greek;}{\f196\fmodern\fcharset162\fprq1 Courier New Tur;}{\f197\fmodern\fcharset177\fprq1 Courier New (Hebrew);} -{\f198\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f199\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f200\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255; -\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0; -\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 \snext0 Normal;}{\*\cs10 \additive \ssemihidden -Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\s15\ql \li0\ri0\widctlpar -\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 -\sbasedon0 \snext15 \styrsid9046091 HTML Preformatted;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid9046091\rsid11037878\rsid11602808\rsid13259699\rsid16008859}{\*\generator Microsoft Word 10.0.3416;}{\info -{\title This software is copyrighted by the Centre d\'92\'e9tude de la Navigation}{\author Lecoanet}{\operator Lecoanet}{\creatim\yr2005\mo3\dy23\hr17\min11}{\revtim\yr2005\mo6\dy10\hr9\min49}{\version6}{\edmins9}{\nofpages1}{\nofwords123}{\nofchars679} -{\*\company CENA}{\nofcharsws801}{\vern16453}}\margl1417\margr1417\margt1417\margb1417 \widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984 -\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot11037878 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}} -{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (} -{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain -\ql \li0\ri50\nowidctlpar\faauto\rin50\lin0\itap0\pararsid11602808 \fs24\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 {\f1\fs20\insrsid16008859\charrsid16008859 Copyright (c) 2005, Centre d'\'e9tudes de la Navigation A\'e9rienne, Patrick Lecoanet - -\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid16008859 {\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859\charrsid16008859 All rights reserved.}{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid16008859 -\par }{\f1\fs20\lang1033\langfe1036\langnp1033\insrsid13259699\charrsid16008859 -\par }\pard\plain \s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9046091 -\f2\fs20\lang1036\langfe1036\cgrid\langnp1036\langfenp1036 {\f1\lang2057\langfe1036\langnp2057\insrsid9046091\charrsid9046091 This library is free software; you can redistribute it and/or -\par }\pard \s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9046091 { -\f1\lang2057\langfe1036\langnp2057\insrsid9046091\charrsid9046091 modify it under the terms of the GNU Lesser General Public -\par License as published by the Free Software Foundation; either -\par version 2.1 of the License, or (at your option) any later version. -\par -\par This library is distributed in the hope that it will be useful, -\par but WITHOUT ANY WARRANTY; without even the implied warranty of -\par MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -\par }\pard \s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9046091 { -\f1\lang2057\langfe1036\langnp2057\insrsid9046091\charrsid9046091 Lesser General Public License for more details. -\par }\pard \s15\ql \li0\ri0\widctlpar\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9046091 { -\f1\lang2057\langfe1036\langnp2057\insrsid9046091\charrsid9046091 -\par You should have received a copy of the GNU Lesser General Public -\par License along with this library; if not, write to the Free Software -\par Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA}{\f1\lang2057\langfe1036\langnp2057\insrsid16008859\charrsid9046091 -\par }} \ No newline at end of file diff --git a/win/InstallerIcons/Banner.bmp b/win/InstallerIcons/Banner.bmp deleted file mode 100644 index 77fe2b6..0000000 Binary files a/win/InstallerIcons/Banner.bmp and /dev/null differ diff --git a/win/InstallerIcons/Complete.ico b/win/InstallerIcons/Complete.ico deleted file mode 100644 index 93a95a1..0000000 Binary files a/win/InstallerIcons/Complete.ico and /dev/null differ diff --git a/win/InstallerIcons/Custom.ico b/win/InstallerIcons/Custom.ico deleted file mode 100644 index 878d3ba..0000000 Binary files a/win/InstallerIcons/Custom.ico and /dev/null differ diff --git a/win/InstallerIcons/Dialog.bmp b/win/InstallerIcons/Dialog.bmp deleted file mode 100644 index bcbd5ed..0000000 Binary files a/win/InstallerIcons/Dialog.bmp and /dev/null differ diff --git a/win/InstallerIcons/Exclam.ico b/win/InstallerIcons/Exclam.ico deleted file mode 100644 index 906ce32..0000000 Binary files a/win/InstallerIcons/Exclam.ico and /dev/null differ diff --git a/win/InstallerIcons/Info.ico b/win/InstallerIcons/Info.ico deleted file mode 100644 index 7e0ff7f..0000000 Binary files a/win/InstallerIcons/Info.ico and /dev/null differ diff --git a/win/InstallerIcons/New.ico b/win/InstallerIcons/New.ico deleted file mode 100644 index 27881df..0000000 Binary files a/win/InstallerIcons/New.ico and /dev/null differ diff --git a/win/InstallerIcons/Remove.ico b/win/InstallerIcons/Remove.ico deleted file mode 100644 index 097cafe..0000000 Binary files a/win/InstallerIcons/Remove.ico and /dev/null differ diff --git a/win/InstallerIcons/Repair.ico b/win/InstallerIcons/Repair.ico deleted file mode 100644 index 6fb6861..0000000 Binary files a/win/InstallerIcons/Repair.ico and /dev/null differ diff --git a/win/InstallerIcons/Typical.ico b/win/InstallerIcons/Typical.ico deleted file mode 100644 index 94753ac..0000000 Binary files a/win/InstallerIcons/Typical.ico and /dev/null differ diff --git a/win/InstallerIcons/Up.ico b/win/InstallerIcons/Up.ico deleted file mode 100644 index 86f6b5a..0000000 Binary files a/win/InstallerIcons/Up.ico and /dev/null differ diff --git a/win/Tkzinc.wxs.in b/win/Tkzinc.wxs.in deleted file mode 100644 index bcaea67..0000000 --- a/win/Tkzinc.wxs.in +++ /dev/null @@ -1,1579 +0,0 @@ - - - - - - - - - - - - - 8.4.9.0 - 811 - 245 - - @MAJOR_VERSION@.@MINOR_VERSION@.@PATCHLEVEL@ - @MAJOR_VERSION@@MINOR_VERSION@ - @MAJOR_VERSION@@MINOR_VERSION@@PATCHLEVEL@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT ACTIVE_TCL_VERSION = RequiredTclVersion - - - - - - - - - - - - - - NOT ACTIVE_PERL_VERSION = RequiredPerlVersion - - - - - - - - - - - - - - - NOT ACTIVE_PYTHON_VERSION = RequiredPythonVersion - - - - - - - - - - - - - - - - - - - - - - 2 - - &No - &Install - Setup - Br&owse - custicon - &Next > - < &Back - Typical - installs - No - Setup Wizard - removico - exclamic - none - &Reset - &Remove - completi - &Yes - &Exit - &Return - dlgbmp - {&DlgFontBold8} - &Ignore - repairic - &Resume - insticon - &Finish - P - @@@@@]]> - Installing - Cancel - 3 - info - &Repair - &Retry - bannrbmp - OK - - - - - DlgFont8 - ErrorDlg - - - - 1 - 1 - - - 1 - - - - - The [Wizard] will create a server image of [ProductName] [ProductVersion], at a specified network location. Click Next to continue or Cancel to exit the [Wizard]. - - - - {\VerdanaBold13}Welcome to the [ProductName] [ProductVersion] [Wizard] - - - - - - 1 - - - - - - - Please wait while the [Wizard] prepares to guide you through the installation. - - - - - - {\VerdanaBold13}Welcome to the [ProductName] [ProductVersion] [Wizard] - - - - - - - - - 1 - - - - - - - - - Please wait while the [Wizard] [Progress2] [ProductName] [ProductVersion]. This may take several minutes. - - - - [DlgTitleFont][Progress1] [ProductName] [ProductVersion] - - - - - - - - - - - 1 - - - - - - - {\VerdanaBold13}[ProductName] [ProductVersion] [Wizard] was interrupted - - - [ProductName] [ProductVersion] setup was interrupted. Your system has not been modified. To install this program at a later time, please run the installation again. - - - Click the Finish button to exit the [Wizard]. - - - - - - 1 - - - - - - - {\VerdanaBold13}[ProductName] [ProductVersion] [Wizard] ended prematurely - - - [ProductName] [ProductVersion] setup ended prematurely because of an error. Your system has not been modified. To install this program at a later time, please run the installation again. - - - Click the Finish button to exit the [Wizard]. - - - - - - 1 - - - - - - Click the Finish button to exit the [Wizard]. - - - - {\VerdanaBold13}Completing the [ProductName] [ProductVersion] [Wizard] - - - - - - - 1 - 1 - - - 1 - 1 - - - - - - - 1 - - - 1 - - - - - - Browse to the destination folder - - - - [DlgTitleFont]Change current destination folder - - - - - - - &Enter a new network location or click Browse to browse to one. - - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - - Please specify a network location for the server image of [ProductName] [ProductVersion] product - - - - [DlgTitleFont]Network Location - - - - - - - &Please enter the name of your organization in the box below. This will be used as default company name for subsequent installations of [ProductName] [ProductVersion]: - - - - CD &Key: - - - - 1 - - - 0 - ProductID - - - 1 - - - - Please enter your company information - - - - [DlgTitleFont]Company Information - - - - - - - - 1 - 1 - - - 1 - 1 - - - - - - - 1 - - - 1 - - - - - - Browse to the destination folder - - - - [DlgTitleFont]Change current destination folder - - - - - - - 1 - - - 1 - - - Are you sure you want to cancel [ProductName] [ProductVersion] installation? - - - - - - - - 1 - Installed - - - 1 - - - - Disk &Usage - 1 - - - - - - - - 1 - - - - 1 - - - - Select the way you want features to be installed. - - - Click on the icons in the tree below to change the way features will be installed. - - - - [DlgTitleFont]Custom Setup - - - - - Multiline description of the currently selected item. - - - - The size of the currently selected item. - - - - <The selection's path> - - - Installed - - - - Installed - - - - - - 1 - - - - The disk space required for the installation of the selected features. - - - The highlighted volumes (if any) do not have enough disk space available for the currently selected features. You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s). - - - - [DlgTitleFont]Disk Space Requirements - - - - {120}{70}{70}{70}{70} - - - - - - - 1 - - - 1 - - - 1 - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 1 - - - 1 - - - 1 - - - - Some files that need to be updated are currently in use. - - - The following applications are using files that need to be updated by this setup. Close these applications and then click Retry to continue the installation or Cancel to exit it. - - - - [DlgTitleFont]Files in Use - - - - - - - - - 1 - - - - CostingComplete = 1 - - "Yes"]]> - IAgree = "Yes" - - - 1 - - - - - - - Please read the following license agreement carefully - - - - [DlgTitleFont]End-User License Agreement - - - - - - - - - Active Tcl has not been found or it is not the right version: [ACTIVE_TCL_VERSION] ([RequiredTclVersion] needed) - ACTIVE_TCL_VERSION = RequiredTclVersion - - - Active Perl has not been found or it is not at the right version: [ACTIVE_PERL_VERSION] ([RequiredPerlVersion] needed) - ACTIVE_PERL_VERSION = RequiredPerlVersion - - - Active Python has not been found or it is not the right version: [ACTIVEPYDIR] [ACTIVE_PYTHON_VERSION] ([RequiredPythonVersion] needed) - ACTIVE_PYTHON_VERSION = RequiredPythonVersion - - - 1 - - - 0 - CostingComplete = 1 - ProductID - - - 1 - - - - Please enter your customer information - - - - [DlgTitleFont]Customer Information - - - - - - - [DlgTitleFont]&Modify - - - 1 - 1 - 1 - 1 - - - [DlgTitleFont]Re&pair - - - 1 - 1 - 1 - 1 - - - [DlgTitleFont]&Remove - - - 1 - 1 - 1 - 1 - - - 1 - - - - 1 - - - - Select the operation you wish to perform. - - - - [DlgTitleFont]Modify, Repair or Remove installation - - - - Allows users to change the way features are installed. - - - Removes [ProductName] [ProductVersion] from your computer. - - - Repairs errors in the most recent installation state - fixes missing or corrupt files, shortcuts and registry entries. - - - - - - CostingComplete = 1 - 1 - - - 1 - - - - - The [Wizard] will allow you to change the way [ProductName] [ProductVersion] features are installed on your computer or even to remove [ProductName] from your computer. Click Next to continue or Cancel to exit the [Wizard]. - - - - {\VerdanaBold13}Welcome to the [ProductName] [ProductVersion] [Wizard] - - - - - - 1 - - - - Disk space required for the installation exceeds available disk space. - - - The highlighted volumes do not have enough disk space available for the currently selected features. You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s). - - - - [DlgTitleFont]Out of Disk Space - - - - {120}{70}{70}{70}{70} - - - - - - 1 - - - 1 - 1 - - - - Disk space required for the installation exceeds available disk space. - - - The highlighted volumes do not have enough disk space available for the currently selected features. You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s). - - - - [DlgTitleFont]Out of Disk Space - - - - {120}{70}{70}{70}{70} - - - Alternatively, you may choose to disable the installer's rollback functionality. This allows the installer to restore your computer's original state should the installation be interrupted in any way. Click Yes if you wish to take the risk to disable rollback. - - - - - - CostingComplete = 1 - 1]]> - - - - - - - 1 - - - - - The [Wizard] will complete the installation of [ProductName] [ProductVersion] on your computer. Click Install to continue or Cancel to exit the [Wizard]. - - - - {\VerdanaBold13}Resuming the [ProductName] [ProductVersion] [Wizard] - - - - - - [DlgTitleFont]&Typical - - - 1 - 1 - 1 - - - [DlgTitleFont]C&ustom - - - 1 - 1 - - - [DlgTitleFont]C&omplete - - - 1 - 1 - 1 - - - 1 - - - - 1 - - - - Choose the setup type that best suits your needs - - - - [DlgTitleFont]Choose Setup Type - - - - All program features will be installed. (Requires most disk space) - - - Allows users to choose which program features will be installed and where they will be installed. Recommended for advanced users. - - - Installs the most common program features. Recommended for most users. - - - - - - 1]]> - - - - - - - 1 - - - - - - - - - - The [Wizard] is ready to begin the [InstallMode] installation - - - Click Install to begin the installation. If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard. - - - - [DlgTitleFont]Ready to Install - - - - - - - 1 - - - 1]]> - 1]]> - - - - - - - 1 - - - - You have chosen to remove the program from your computer. - - - Click Remove to remove [ProductName] [ProductVersion] from your computer. If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard. - - - - [DlgTitleFont]Remove [ProductName] [ProductVersion] - - - - - - - 1]]> - 1]]> - 1]]> - - - - - - - 1 - - - - 1 - - - The [Wizard] is ready to begin the repair of [ProductName] [ProductVersion]. - - - Click Repair to repair the installation of [ProductName] [ProductVersion]. If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard. - - - - [DlgTitleFont]Repair [ProductName] [ProductVersion] - - - - - - - 1 - - - Please wait while the installer finishes determining your disk space requirements. - - - - - - - 1 - - - 1 - - - - - The [Wizard] will install [ProductName] [ProductVersion] on your computer. Click Next to continue or Cancel to exit the [Wizard]. - - - - {\VerdanaBold13}Welcome to the [ProductName] [ProductVersion] [Wizard] - - - - - - - - - - - - - - bytes - GB - KB - MB - Entire feature will be unavailable - Feature will be installed when required - Entire feature will be installed to run from CD - Entire feature will be installed on local hard drive - Entire feature will be installed to run from network - Will be installed to run from CD - Will be installed on local hard drive - Will be installed to run from network - Gathering required information... - This feature will remain uninstalled - This feature will be set to be installed when required - This feature will be installed to run from CD - This feature will be installed on the local hard drive - This feature will be installed to run from the network - This feature will become unavailable - Will be installed when required - This feature will be available to run from CD - This feature will be installed on your local hard drive - This feature will be available to run from the network - This feature will be uninstalled completely, you won't be able to run it from CD - This feature will change from run from CD state to set to be installed when required - This feature will remain to be run from CD - This feature will change from run from CD state to be installed on the local hard drive - This feature frees up [1] on your hard drive. - This feature requires [1] on your hard drive. - Compiling cost for this feature... - This feature will be completely removed - This feature will be removed from your local hard drive, but will be set to be installed when required - This feature will be removed from your local hard drive, but will be still available to run from CD - This feature will remain on you local hard drive - This feature will be removed from your local hard drive, but will be still available to run from the network - This feature will be uninstalled completely, you won't be able to run it from the network - This feature will change from run from network state to set to be installed when required - This feature will change from run from network state to be installed on the local hard drive - This feature will remain to be run from the network - This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive. - This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive. - This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive. - This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive. - Time remaining: {[1] minutes }{[2] seconds} - Available - Difference - Required - Disk Size - Volume - Computing space requirements - Computing space requirements - Computing space requirements - Validating install - Copying new files - Copying network install files - Creating shortcuts - Publishing Qualified Components - Publishing Product Features - Publishing product information - Registering Class servers - Registering extension servers - Registering MIME info - Registering program identifiers - Allocating registry space - Searching for installed applications - Binding executables - Searching for qualifying products - Creating folders - Deleting services - Creating duplicate files - Searching for related applications - Installing ODBC components - Installing new services - Evaluating launch conditions - Migrating feature states from related applications - Moving files - Patching files - Updating component registration - Registering COM+ Applications and Components - Registering fonts - Registering product - Registering type libraries - Registering user - Removing duplicated files - Updating environment strings - Removing applications - Removing files - Removing folders - Removing INI files entries - Removing ODBC components - Removing system registry values - Removing shortcuts - Searching for qualifying products - Registering modules - Unregistering modules - Initializing ODBC directories - Starting services - Stopping services - Unpublishing Qualified Components - Unpublishing Product Features - Unregister Class servers - Unregistering COM+ Applications and Components - Unregistering extension servers - Unregistering fonts - Unregistering MIME info - Unregistering program identifiers - Unregistering type libraries - Updating environment strings - Writing INI files values - Writing system registry values - Advertising application - Generating script operations for action: - Installing system catalog - Publishing assembly information - Unpublishing assembly information - Rolling back action: - Removing backup files - Removing moved files - Unpublishing product information - {{Fatal error: }} - {{Error [1]. }} - Warning [1]. - - Info [1]. - The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}} - - {{Disk full: }} - Action [Time]: [1]. [2] - [ProductName] [ProductVersion] - {[2]}{, [3]}{, [4]} - Message type: [1], Argument: [2] - === Logging started: [Date] [Time] === - === Logging stopped: [Date] [Time] === - Action start [Time]: [1]. - Action ended [Time]: [1]. Return value [2]. - Time remaining: {[1] minutes }{[2] seconds} - Out of memory. Shut down other applications before retrying. - Installer is no longer responding. - Installer stopped prematurely. - Please wait while Windows configures [ProductName] [ProductVersion] - Gathering required information... - Removing older versions of this application... - Preparing to remove older versions of this application... - {[ProductName] [ProductVersion] }Setup completed successfully. - {[ProductName] [ProductVersion] }Setup failed. - Error reading from file: [2]. {{ System error [3].}} Verify that the file exists and that you can access it. - Cannot create the file '[2]'. A directory with this name already exists. Cancel the install and try installing to a different location. - Please insert the disk: [2] - The installer has insufficient privileges to access this directory: [2]. The installation cannot continue. Log on as administrator or contact your system administrator. - Error writing to file: [2]. Verify that you have access to that directory. - Error reading from file [2]. {{ System error [3].}} Verify that the file exists and that you can access it. - Another application has exclusive access to the file '[2]'. Please shut down all other applications, then click Retry. - There is not enough disk space to install this file: [2]. Free some disk space and click Retry, or click Cancel to exit. - Source file not found: [2]. Verify that the file exists and that you can access it. - Error reading from file: [3]. {{ System error [2].}} Verify that the file exists and that you can access it. - Error writing to file: [3]. {{ System error [2].}} Verify that you have access to that directory. - Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it. - Cannot create the directory '[2]'. A file with this name already exists. Please rename or remove the file and click retry, or click Cancel to exit. - The volume [2] is currently unavailable. Please select another. - The specified path '[2]' is unavailable. - Unable to write to the specified folder: [2]. - A network error occurred while attempting to read from the file: [2] - An error occurred while attempting to create the directory: [2] - A network error occurred while attempting to create the directory: [2] - A network error occurred while attempting to open the source file cabinet: [2] - The specified path is too long: [2] - The Installer has insufficient privileges to modify this file: [2]. - A portion of the folder path '[2]' is invalid. It is either empty or exceeds the length allowed by the system. - The folder path '[2]' contains words that are not valid in folder paths. - The folder path '[2]' contains an invalid character. - '[2]' is not a valid short file name. - Error getting file security: [3] GetLastError: [2] - Invalid Drive: [2] - Error applying patch to file [2]. It has probably been updated by other means, and can no longer be modified by this patch. For more information contact your patch vendor. {{System Error: [3]}} - A file that is required cannot be installed because the cabinet file [2] is not digitally signed. This may indicate that the cabinet file is corrupt. - A file that is required cannot be installed because the cabinet file [2] has an invalid digital signature. This may indicate that the cabinet file is corrupt.{{ Error [3] was returned by WinVerifyTrust.}} - Failed to correctly copy [2] file: CRC error. - Failed to correctly move [2] file: CRC error. - Failed to correctly patch [2] file: CRC error. - The file '[2]' cannot be installed because the file cannot be found in cabinet file '[3]'. This could indicate a network error, an error reading from the CD-ROM, or a problem with this package. - The cabinet file '[2]' required for this installation is corrupt and cannot be used. This could indicate a network error, an error reading from the CD-ROM, or a problem with this package. - There was an error creating a temporary file that is needed to complete this installation.{{ Folder: [3]. System error code: [2]}} - Could not create key: [2]. {{ System error [3].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not open key: [2]. {{ System error [3].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not delete value [2] from key [3]. {{ System error [4].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not delete key [2]. {{ System error [3].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not read value [2] from key [3]. {{ System error [4].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not write value [2] to key [3]. {{ System error [4].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not get value names for key [2]. {{ System error [3].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not get sub key names for key [2]. {{ System error [3].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not read security information for key [2]. {{ System error [3].}} Verify that you have sufficient access to that key, or contact your support personnel. - Could not increase the available registry space. [2] KB of free registry space is required for the installation of this application. - Another installation is in progress. You must complete that installation before continuing this one. - Error accessing secured data. Please make sure the Windows Installer is configured properly and try the install again. - User '[2]' has previously initiated an install for product '[3]'. That user will need to run that install again before they can use that product. Your current install will now continue. - User '[2]' has previously initiated an install for product '[3]'. That user will need to run that install again before they can use that product. - Out of disk space -- Volume: '[2]'; required space: [3] KB; available space: [4] KB. Free some disk space and retry. - Are you sure you want to cancel? - The file [2][3] is being held in use{ by the following process: Name: [4], Id: [5], Window Title: '[6]'}. Close that application and retry. - The product '[2]' is already installed, preventing the installation of this product. The two products are incompatible. - There is not enough disk space on the volume '[2]' to continue the install with recovery enabled. [3] KB are required, but only [4] KB are available. Click Ignore to continue the install without saving recovery information, click Retry to check for available space again, or click Cancel to quit the installation. - Could not access network location [2]. - The following applications should be closed before continuing the install: - Could not find any previously installed compliant products on the machine for installing this product. - An error occurred while applying security settings. [2] is not a valid user or group. This could be a problem with the package, or a problem connecting to a domain controller on the network. Check your network connection and click Retry, or Cancel to end the install. {{Unable to locate the user's SID, system error [3]}} - The key [2] is not valid. Verify that you entered the correct key. - The installer must restart your system before configuration of [2] can continue. Click Yes to restart now or No if you plan to manually restart later. - You must restart your system for the configuration changes made to [2] to take effect. Click Yes to restart now or No if you plan to manually restart later. - An installation for [2] is currently suspended. You must undo the changes made by that installation to continue. Do you want to undo those changes? - A previous installation for this product is in progress. You must undo the changes made by that installation to continue. Do you want to undo those changes? - An installation package for the product [2] cannot be found. Try the installation again using a valid copy of the installation package '[3]'. - Installation completed successfully. - Installation failed. - Product: [2] -- [3] - You may either restore your computer to its previous state or continue the install later. Would you like to restore? - An error occurred while writing installation information to disk. Check to make sure enough disk space is available, and click Retry, or Cancel to end the install. - One or more of the files required to restore your computer to its previous state could not be found. Restoration will not be possible. - [2] cannot install one of its required products. Contact your technical support group. {{System Error: [3].}} - The older version of [2] cannot be removed. Contact your technical support group. {{System Error [3].}} - Installed [2] - Configured [2] - Removed [2] - File [2] was rejected by digital signature policy. - The Windows Installer Service could not be accessed. This can occur if you are running Windows in safe mode, or if the Windows Installer is not correctly installed. Contact your support personnel for assistance. - There is a problem with this Windows Installer package. A script required for this install to complete could not be run. Contact your support personnel or package vendor. {{Custom action [2] script error [3], [4]: [5] Line [6], Column [7], [8] }} - There is a problem with this Windows Installer package. A program required for this install to complete could not be run. Contact your support personnel or package vendor. {{Action: [2], location: [3], command: [4] }} - There is a problem with this Windows Installer package. A program run as part of the setup did not finish as expected. Contact your support personnel or package vendor. {{Action [2], location: [3], command: [4] }} - There is a problem with this Windows Installer package. A DLL required for this install to complete could not be run. Contact your support personnel or package vendor. {{Action [2], entry: [3], library: [4] }} - Removal completed successfully. - Removal failed. - Advertisement completed successfully. - Advertisement failed. - Configuration completed successfully. - Configuration failed. - You must be an Administrator to remove this application. To remove this application, you can log on as an Administrator, or contact your technical support group for assistance. - The path [2] is not valid. Please specify a valid path. - Out of memory. Shut down other applications before retrying. - There is no disk in drive [2]. Please insert one and click Retry, or click Cancel to go back to the previously selected volume. - There is no disk in drive [2]. Please insert one and click Retry, or click Cancel to return to the browse dialog and select a different volume. - The folder [2] does not exist. Please enter a path to an existing folder. - You have insufficient privileges to read this folder. - A valid destination folder for the install could not be determined. - Error attempting to read from the source install database: [2]. - Scheduling reboot operation: Renaming file [2] to [3]. Must reboot to complete operation. - Scheduling reboot operation: Deleting file [2]. Must reboot to complete operation. - Module [2] failed to register. HRESULT [3]. Contact your support personnel. - Module [2] failed to unregister. HRESULT [3]. Contact your support personnel. - Failed to cache package [2]. Error: [3]. Contact your support personnel. - Could not register font [2]. Verify that you have sufficient permissions to install fonts, and that the system supports this font. - Could not unregister font [2]. Verify that you that you have sufficient permissions to remove fonts. - Could not create Shortcut [2]. Verify that the destination folder exists and that you can access it. - Could not remove Shortcut [2]. Verify that the shortcut file exists and that you can access it. - Could not register type library for file [2]. Contact your support personnel. - Could not unregister type library for file [2]. Contact your support personnel. - Could not update the ini file [2][3]. Verify that the file exists and that you can access it. - Could not schedule file [2] to replace file [3] on reboot. Verify that you have write permissions to file [3]. - Error removing ODBC driver manager, ODBC error [2]: [3]. Contact your support personnel. - Error installing ODBC driver manager, ODBC error [2]: [3]. Contact your support personnel. - Error removing ODBC driver: [4], ODBC error [2]: [3]. Verify that you have sufficient privileges to remove ODBC drivers. - Error installing ODBC driver: [4], ODBC error [2]: [3]. Verify that the file [4] exists and that you can access it. - Error configuring ODBC data source: [4], ODBC error [2]: [3]. Verify that the file [4] exists and that you can access it. - Service '[2]' ([3]) failed to start. Verify that you have sufficient privileges to start system services. - Service '[2]' ([3]) could not be stopped. Verify that you have sufficient privileges to stop system services. - Service '[2]' ([3]) could not be deleted. Verify that you have sufficient privileges to remove system services. - Service '[2]' ([3]) could not be installed. Verify that you have sufficient privileges to install system services. - Could not update environment variable '[2]'. Verify that you have sufficient privileges to modify environment variables. - You do not have sufficient privileges to complete this installation for all users of the machine. Log on as administrator and then retry this installation. - Could not set file security for file '[3]'. Error: [2]. Verify that you have sufficient privileges to modify the security permissions for this file. - Component Services (COM+ 1.0) are not installed on this computer. This installation requires Component Services in order to complete successfully. Component Services are available on Windows 2000. - Error registering COM+ Application. Contact your support personnel for more information. - Error unregistering COM+ Application. Contact your support personnel for more information. - The description for service '[2]' ([3]) could not be changed. - The Windows Installer service cannot update the system file [2] because the file is protected by Windows. You may need to update your operating system for this program to work correctly. {{Package version: [3], OS Protected version: [4]}} - The Windows Installer service cannot update the protected Windows file [2]. {{Package version: [3], OS Protected version: [4], SFP Error: [5]}} - The Windows Installer service cannot update one or more protected Windows files. {{SFP Error: [2]. List of protected files:\r\n[3]}} - User installations are disabled via policy on the machine. - An error occured during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}} - - - - - - - - - - - - - - - - NOT Installed - Installed AND (RESUME OR Preselected) - Installed AND NOT RESUME AND NOT Preselected - - - - - - - - - - - - - diff --git a/win/WinPort.c b/win/WinPort.c deleted file mode 100644 index 812165a..0000000 --- a/win/WinPort.c +++ /dev/null @@ -1,1031 +0,0 @@ -/* - * WinPort.c -- Compatibility layer for Windows 2k - * - * Authors : Patrick Lecoanet. - * Creation date : - * - * $Id$ - */ - -/* - * Copyright (c) 2003 - 2005 CENA, Patrick Lecoanet -- - * - * See the file "Copyright" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - */ - -#ifdef _WIN32 - -#include "Types.h" - -#include -#include -#ifdef PTK -#include -#endif - -static const char rcsid[] = "$Id"; -static const char compile_id[]="$Compile$"; - -#ifndef MIN -#define MIN(a, b) ((a) <= (b) ? (a) : (b)) -#endif -#ifndef MAX -#define MAX(a, b) ((a) >= (b) ? (a) : (b)) -#endif - - -/* - *---------------------------------------------------------------------- - * - * ZnPointInRegion -- - * - * Test whether the specified point is inside a region. - * - * Results: - * Returns the boolean result of the test. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ -int -ZnPointInRegion(TkRegion reg, - int x, - int y) -{ - return PtInRegion((HRGN) reg, x, y); -} - -/* - *---------------------------------------------------------------------- - * - * ZnUnionRegion -- - * - * Compute the union of two regions. - * - * Results: - * Returns the result in the dr_return region. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ -void -ZnUnionRegion(TkRegion sra, - TkRegion srb, - TkRegion dr_return) -{ - CombineRgn((HRGN) dr_return, (HRGN) sra, (HRGN) srb, RGN_OR); -} - -/* - *---------------------------------------------------------------------- - * - * ZnOffsetRegion -- - * - * Offset a region by the specified pixel offsets. - * - * Results: - * Returns the result in the dr_return region. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ -void -ZnOffsetRegion(TkRegion reg, - int dx, - int dy) -{ - OffsetRgn((HRGN) reg, dx, dy); -} - -/* - *---------------------------------------------------------------------- - * - * ZnPolygonRegion -- - * - * Compute a region from a polygon. - * - * Results: - * Returns the result in the dr_return region. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ -TkRegion -ZnPolygonRegion(XPoint *points, - int n, - int fill_rule) -{ - POINT *pts; - HRGN reg; - int i; - - pts = (POINT *) ckalloc(n*sizeof(POINT)); - for (i = 0; i < n; i++, points++) { - pts[i].x = points->x; - pts[i].y = points->y; - } - - reg = CreatePolygonRgn(pts, n, - fill_rule==EvenOddRule?ALTERNATE:WINDING); - if (!reg) { - fprintf(stderr, "Polygon region failed: %ld, n: %d\n", GetLastError(), n); - } - ckfree((char *) pts); - return (TkRegion) reg; -} - -#define PI 3.14159265358979 -#define XAngleToRadians(a) ((double)(a) / 64 * PI / 180); - -/* - * Translation table between X gc functions and Win32 raster op modes. - */ - -int tkpWinRopModes[] = { - R2_BLACK, /* GXclear */ - R2_MASKPEN, /* GXand */ - R2_MASKPENNOT, /* GXandReverse */ - R2_COPYPEN, /* GXcopy */ - R2_MASKNOTPEN, /* GXandInverted */ - R2_NOT, /* GXnoop */ - R2_XORPEN, /* GXxor */ - R2_MERGEPEN, /* GXor */ - R2_NOTMERGEPEN, /* GXnor */ - R2_NOTXORPEN, /* GXequiv */ - R2_NOT, /* GXinvert */ - R2_MERGEPENNOT, /* GXorReverse */ - R2_NOTCOPYPEN, /* GXcopyInverted */ - R2_MERGENOTPEN, /* GXorInverted */ - R2_NOTMASKPEN, /* GXnand */ - R2_WHITE /* GXset */ -}; - -/* - * The following two raster ops are used to copy the foreground and background - * bits of a source pattern as defined by a stipple used as the pattern. - */ - -#define COPYFG 0x00CA0749 /* dest = (pat & src) | (!pat & dst) */ -#define COPYBG 0x00AC0744 /* dest = (!pat & src) | (pat & dst) */ - -/* - * The followng typedef is used to pass Windows GDI drawing functions. - */ - -typedef BOOL (CALLBACK *WinDrawFunc) _ANSI_ARGS_((HDC dc, - CONST POINT* points, int npoints)); - -typedef struct ThreadSpecificData { - POINT *winPoints; /* Array of points that is reused. */ - int nWinPoints; /* Current size of point array. */ -} ThreadSpecificData; -static Tcl_ThreadDataKey dataKey; - -/* - *---------------------------------------------------------------------- - * - * SetUpGraphicsPort -- - * - * Set up the graphics port from the given GC. - * - * Results: - * None. - * - * Side effects: - * The current port is adjusted. - * - *---------------------------------------------------------------------- - */ - -static HPEN -SetUpGraphicsPort(gc) - GC gc; -{ - DWORD style; - - if (gc->line_style == LineOnOffDash) { - unsigned char *p = (unsigned char *) &(gc->dashes); - /* pointer to the dash-list */ - - /* - * Below is a simple translation of serveral dash patterns - * to valid windows pen types. Far from complete, - * but I don't know how to do it better. - * Any ideas: - */ - - if (p[1] && p[2]) { - if (!p[3] || p[4]) { - style = PS_DASHDOTDOT; /* -.. */ - } else { - style = PS_DASHDOT; /* -. */ - } - } else { - if (p[0] > (4 * gc->line_width)) { - style = PS_DASH; /* - */ - } else { - style = PS_DOT; /* . */ - } - } - } else { - style = PS_SOLID; - } - if (gc->line_width < 2) { - return CreatePen(style, gc->line_width, gc->foreground); - } else { - LOGBRUSH lb; - - lb.lbStyle = BS_SOLID; - lb.lbColor = gc->foreground; - lb.lbHatch = 0; - - style |= PS_GEOMETRIC; - switch (gc->cap_style) { - case CapNotLast: - case CapButt: - style |= PS_ENDCAP_FLAT; - break; - case CapRound: - style |= PS_ENDCAP_ROUND; - break; - default: - style |= PS_ENDCAP_SQUARE; - break; - } - switch (gc->join_style) { - case JoinMiter: - style |= PS_JOIN_MITER; - break; - case JoinRound: - style |= PS_JOIN_ROUND; - break; - default: - style |= PS_JOIN_BEVEL; - break; - } - return ExtCreatePen(style, gc->line_width, &lb, 0, NULL); - } -} - -/* - *---------------------------------------------------------------------- - * - * ConvertPoints -- - * - * Convert an array of X points to an array of Win32 points. - * - * Results: - * Returns the converted array of POINTs. - * - * Side effects: - * Allocates a block of memory in thread local storage that - * should not be freed. - * - *---------------------------------------------------------------------- - */ - -static POINT * -ConvertPoints(points, npoints, mode, bbox) - XPoint *points; - int npoints; - int mode; /* CoordModeOrigin or CoordModePrevious. */ - RECT *bbox; /* Bounding box of points. */ -{ - ThreadSpecificData *tsdPtr = (ThreadSpecificData *) - Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - int i; - - /* - * To avoid paying the cost of a malloc on every drawing routine, - * we reuse the last array if it is large enough. - */ - - if (npoints > tsdPtr->nWinPoints) { - if (tsdPtr->winPoints != NULL) { - ckfree((char *) tsdPtr->winPoints); - } - tsdPtr->winPoints = (POINT *) ckalloc(sizeof(POINT) * npoints); - if (tsdPtr->winPoints == NULL) { - tsdPtr->nWinPoints = -1; - return NULL; - } - tsdPtr->nWinPoints = npoints; - } - - bbox->left = bbox->right = points[0].x; - bbox->top = bbox->bottom = points[0].y; - - if (mode == CoordModeOrigin) { - for (i = 0; i < npoints; i++) { - tsdPtr->winPoints[i].x = points[i].x; - tsdPtr->winPoints[i].y = points[i].y; - bbox->left = MIN(bbox->left, tsdPtr->winPoints[i].x); - bbox->right = MAX(bbox->right, tsdPtr->winPoints[i].x); - bbox->top = MIN(bbox->top, tsdPtr->winPoints[i].y); - bbox->bottom = MAX(bbox->bottom, tsdPtr->winPoints[i].y); - } - } else { - tsdPtr->winPoints[0].x = points[0].x; - tsdPtr->winPoints[0].y = points[0].y; - for (i = 1; i < npoints; i++) { - tsdPtr->winPoints[i].x = tsdPtr->winPoints[i-1].x + points[i].x; - tsdPtr->winPoints[i].y = tsdPtr->winPoints[i-1].y + points[i].y; - bbox->left = MIN(bbox->left, tsdPtr->winPoints[i].x); - bbox->right = MAX(bbox->right, tsdPtr->winPoints[i].x); - bbox->top = MIN(bbox->top, tsdPtr->winPoints[i].y); - bbox->bottom = MAX(bbox->bottom, tsdPtr->winPoints[i].y); - } - } - return tsdPtr->winPoints; -} - -/* - *---------------------------------------------------------------------- - * - * XFillRectangles -- - * - * Fill multiple rectangular areas in the given drawable. - * - * Results: - * None. - * - * Side effects: - * Draws onto the specified drawable. - * - *---------------------------------------------------------------------- - */ -void -XFillRectangles(display, d, gc, rectangles, nrectangles) - Display* display; - Drawable d; - GC gc; - XRectangle* rectangles; - int nrectangles; -{ - HDC dc; - int i; - RECT rect; - TkWinDCState state; - HBRUSH brush; - TkpClipMask *clipPtr = (TkpClipMask*)gc->clip_mask; - - if (d == None) { - return; - } - - dc = TkWinGetDrawableDC(display, d, &state); - SetROP2(dc, tkpWinRopModes[gc->function]); - brush = CreateSolidBrush(gc->foreground); - - if (clipPtr && clipPtr->type == TKP_CLIP_REGION) { - SelectClipRgn(dc, (HRGN) clipPtr->value.region); - OffsetClipRgn(dc, gc->clip_x_origin, gc->clip_y_origin); - } - if ((gc->fill_style == FillStippled - || gc->fill_style == FillOpaqueStippled) - && gc->stipple != None) { - TkWinDrawable *twdPtr = (TkWinDrawable *)gc->stipple; - HBRUSH oldBrush, stipple; - HBITMAP oldBitmap, bitmap; - HDC dcMem; - HBRUSH bgBrush = CreateSolidBrush(gc->background); - - if (twdPtr->type != TWD_BITMAP) { - Tcl_Panic("unexpected drawable type in stipple"); - } - - /* - * Select stipple pattern into destination dc. - */ - - stipple = CreatePatternBrush(twdPtr->bitmap.handle); - SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL); - oldBrush = SelectObject(dc, stipple); - dcMem = CreateCompatibleDC(dc); - - /* - * For each rectangle, create a drawing surface which is the size of - * the rectangle and fill it with the background color. Then merge the - * result with the stipple pattern. - */ - for (i = 0; i < nrectangles; i++) { - bitmap = CreateCompatibleBitmap(dc, rectangles[i].width, - rectangles[i].height); - oldBitmap = SelectObject(dcMem, bitmap); - rect.left = 0; - rect.top = 0; - rect.right = rectangles[i].width; - rect.bottom = rectangles[i].height; - FillRect(dcMem, &rect, brush); - BitBlt(dc, rectangles[i].x, rectangles[i].y, rectangles[i].width, - rectangles[i].height, dcMem, 0, 0, COPYFG); - if (gc->fill_style == FillOpaqueStippled) { - FillRect(dcMem, &rect, bgBrush); - BitBlt(dc, rectangles[i].x, rectangles[i].y, - rectangles[i].width, rectangles[i].height, dcMem, - 0, 0, COPYBG); - } - SelectObject(dcMem, oldBitmap); - DeleteObject(bitmap); - } - - DeleteDC(dcMem); - SelectObject(dc, oldBrush); - DeleteObject(stipple); - DeleteObject(bgBrush); - } else { - for (i = 0; i < nrectangles; i++) { - TkWinFillRect(dc, rectangles[i].x, rectangles[i].y, - rectangles[i].width, rectangles[i].height, gc->foreground); - } - } - DeleteObject(brush); - TkWinReleaseDrawableDC(d, dc, &state); -} - - -/* - *---------------------------------------------------------------------- - * - * XFillRectangle -- - * - * Fills a rectangular area in the given drawable. This procedure - * is implemented as a call to XFillRectangles. - * - * Results: - * None - * - * Side effects: - * Fills the specified rectangle. - * - *---------------------------------------------------------------------- - */ - -void -XFillRectangle(display, d, gc, x, y, width, height) - Display* display; - Drawable d; - GC gc; - int x; - int y; - unsigned int width; - unsigned int height; -{ - XRectangle rectangle; - rectangle.x = x; - rectangle.y = y; - rectangle.width = width; - rectangle.height = height; - XFillRectangles(display, d, gc, &rectangle, 1); -} - -/* - *---------------------------------------------------------------------- - * - * RenderObject -- - * - * This function draws a shape using a list of points, a - * stipple pattern, and the specified drawing function. - * - * Results: - * None. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - -static void -RenderObject(dc, gc, points, npoints, mode, pen, func) - HDC dc; - GC gc; - XPoint* points; - int npoints; - int mode; - HPEN pen; - WinDrawFunc func; -{ - RECT rect; - HPEN oldPen; - HBRUSH oldBrush; - POINT *winPoints = ConvertPoints(points, npoints, mode, &rect); - TkpClipMask *clipPtr = (TkpClipMask*)gc->clip_mask; - - if (clipPtr && clipPtr->type == TKP_CLIP_REGION) { - SelectClipRgn(dc, (HRGN) clipPtr->value.region); - OffsetClipRgn(dc, gc->clip_x_origin, gc->clip_y_origin); - } - if ((gc->fill_style == FillStippled - || gc->fill_style == FillOpaqueStippled) - && gc->stipple != None) { - - TkWinDrawable *twdPtr = (TkWinDrawable *)gc->stipple; - HDC dcMem; - LONG width, height; - HBITMAP oldBitmap; - int i; - HBRUSH oldMemBrush; - - if (twdPtr->type != TWD_BITMAP) { - Tcl_Panic("unexpected drawable type in stipple"); - } - - /* - * Grow the bounding box enough to account for line width. - */ - - rect.left -= gc->line_width; - rect.top -= gc->line_width; - rect.right += gc->line_width; - rect.bottom += gc->line_width; - - width = rect.right - rect.left; - height = rect.bottom - rect.top; - - /* - * Select stipple pattern into destination dc. - */ - - SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL); - oldBrush = SelectObject(dc, CreatePatternBrush(twdPtr->bitmap.handle)); - - /* - * Create temporary drawing surface containing a copy of the - * destination equal in size to the bounding box of the object. - */ - - dcMem = CreateCompatibleDC(dc); - oldBitmap = SelectObject(dcMem, CreateCompatibleBitmap(dc, width, - height)); - oldPen = SelectObject(dcMem, pen); - BitBlt(dcMem, 0, 0, width, height, dc, rect.left, rect.top, SRCCOPY); - - /* - * Translate the object for rendering in the temporary drawing - * surface. - */ - - for (i = 0; i < npoints; i++) { - winPoints[i].x -= rect.left; - winPoints[i].y -= rect.top; - } - - /* - * Draw the object in the foreground color and copy it to the - * destination wherever the pattern is set. - */ - - SetPolyFillMode(dcMem, (gc->fill_rule == EvenOddRule) ? ALTERNATE - : WINDING); - oldMemBrush = SelectObject(dcMem, CreateSolidBrush(gc->foreground)); - (*func)(dcMem, winPoints, npoints); - BitBlt(dc, rect.left, rect.top, width, height, dcMem, 0, 0, COPYFG); - - /* - * If we are rendering an opaque stipple, then draw the polygon in the - * background color and copy it to the destination wherever the pattern - * is clear. - */ - - if (gc->fill_style == FillOpaqueStippled) { - DeleteObject(SelectObject(dcMem, - CreateSolidBrush(gc->background))); - (*func)(dcMem, winPoints, npoints); - BitBlt(dc, rect.left, rect.top, width, height, dcMem, 0, 0, - COPYBG); - } - - SelectObject(dcMem, oldPen); - DeleteObject(SelectObject(dcMem, oldMemBrush)); - DeleteObject(SelectObject(dcMem, oldBitmap)); - DeleteDC(dcMem); - } else { - oldPen = SelectObject(dc, pen); - oldBrush = SelectObject(dc, CreateSolidBrush(gc->foreground)); - SetROP2(dc, tkpWinRopModes[gc->function]); - - SetPolyFillMode(dc, (gc->fill_rule == EvenOddRule) ? ALTERNATE - : WINDING); - - (*func)(dc, winPoints, npoints); - - SelectObject(dc, oldPen); - } - DeleteObject(SelectObject(dc, oldBrush)); -} - -/* - *---------------------------------------------------------------------- - * - * XDrawLines -- - * - * Draw connected lines. - * - * Results: - * None. - * - * Side effects: - * Renders a series of connected lines. - * - *---------------------------------------------------------------------- - */ - -void -XDrawLines(display, d, gc, points, npoints, mode) - Display* display; - Drawable d; - GC gc; - XPoint* points; - int npoints; - int mode; -{ - HPEN pen; - TkWinDCState state; - HDC dc; - TkpClipMask *clipPtr = (TkpClipMask*)gc->clip_mask; - - if (d == None) { - return; - } - - dc = TkWinGetDrawableDC(display, d, &state); - - if (clipPtr && clipPtr->type == TKP_CLIP_REGION) { - SelectClipRgn(dc, (HRGN) clipPtr->value.region); - OffsetClipRgn(dc, gc->clip_x_origin, gc->clip_y_origin); - } - pen = SetUpGraphicsPort(gc); - SetBkMode(dc, TRANSPARENT); - RenderObject(dc, gc, points, npoints, mode, pen, Polyline); - DeleteObject(pen); - - TkWinReleaseDrawableDC(d, dc, &state); -} - -/* - *---------------------------------------------------------------------- - * - * XDrawLine -- - * - * Draw a single line between two points in a given drawable. - * - * Results: - * None. - * - * Side effects: - * Draws a single line segment. - * - *---------------------------------------------------------------------- - */ - -void -XDrawLine(display, d, gc, x1, y1, x2, y2) - Display* display; - Drawable d; - GC gc; - int x1, y1, x2, y2; /* Coordinates of line segment. */ -{ - XPoint points[2]; - - points[0].x = x1; - points[0].y = y1; - points[1].x = x2; - points[1].y = y2; - XDrawLines(display, d, gc, points, 2, CoordModeOrigin); -} - -/* - *---------------------------------------------------------------------- - * - * XFillPolygon -- - * - * Draws a filled polygon. - * - * Results: - * None. - * - * Side effects: - * Draws a filled polygon on the specified drawable. - * - *---------------------------------------------------------------------- - */ - -void -XFillPolygon(display, d, gc, points, npoints, shape, mode) - Display* display; - Drawable d; - GC gc; - XPoint* points; - int npoints; - int shape; - int mode; -{ - HPEN pen; - TkWinDCState state; - HDC dc; - - if (d == None) { - return; - } - - dc = TkWinGetDrawableDC(display, d, &state); - - pen = GetStockObject(NULL_PEN); - RenderObject(dc, gc, points, npoints, mode, pen, Polygon); - - TkWinReleaseDrawableDC(d, dc, &state); -} - -/* - *---------------------------------------------------------------------- - * - * XDrawRectangle -- - * - * Draws a rectangle. - * - * Results: - * None. - * - * Side effects: - * Draws a rectangle on the specified drawable. - * - *---------------------------------------------------------------------- - */ - -void -XDrawRectangle(display, d, gc, x, y, width, height) - Display* display; - Drawable d; - GC gc; - int x; - int y; - unsigned int width; - unsigned int height; -{ - HPEN pen, oldPen; - TkWinDCState state; - HBRUSH oldBrush; - HDC dc; - TkpClipMask *clipPtr = (TkpClipMask*)gc->clip_mask; - - if (d == None) { - return; - } - - dc = TkWinGetDrawableDC(display, d, &state); - - if (clipPtr && clipPtr->type == TKP_CLIP_REGION) { - SelectClipRgn(dc, (HRGN) clipPtr->value.region); - OffsetClipRgn(dc, gc->clip_x_origin, gc->clip_y_origin); - } - pen = SetUpGraphicsPort(gc); - SetBkMode(dc, TRANSPARENT); - oldPen = SelectObject(dc, pen); - oldBrush = SelectObject(dc, GetStockObject(NULL_BRUSH)); - SetROP2(dc, tkpWinRopModes[gc->function]); - - Rectangle(dc, x, y, x+width+1, y+height+1); - - DeleteObject(SelectObject(dc, oldPen)); - SelectObject(dc, oldBrush); - TkWinReleaseDrawableDC(d, dc, &state); -} - -/* - *---------------------------------------------------------------------- - * - * DrawOrFillArc -- - * - * This procedure handles the rendering of drawn or filled - * arcs and chords. - * - * Results: - * None. - * - * Side effects: - * Renders the requested arc. - * - *---------------------------------------------------------------------- - */ - -static void -DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill) - Display *display; - Drawable d; - GC gc; - int x, y; /* left top */ - unsigned int width, height; - int start; /* start: three-o'clock (deg*64) */ - int extent; /* extent: relative (deg*64) */ - int fill; /* ==0 draw, !=0 fill */ -{ - HDC dc; - HBRUSH brush, oldBrush; - HPEN pen, oldPen; - TkWinDCState state; - int clockwise = (extent < 0); /* non-zero if clockwise */ - int xstart, ystart, xend, yend; - double radian_start, radian_end, xr, yr; - TkpClipMask *clipPtr = (TkpClipMask*)gc->clip_mask; - - if (d == None) { - return; - } - - dc = TkWinGetDrawableDC(display, d, &state); - - if (clipPtr && clipPtr->type == TKP_CLIP_REGION) { - SelectClipRgn(dc, (HRGN) clipPtr->value.region); - OffsetClipRgn(dc, gc->clip_x_origin, gc->clip_y_origin); - } - SetROP2(dc, tkpWinRopModes[gc->function]); - - /* - * Compute the absolute starting and ending angles in normalized radians. - * Swap the start and end if drawing clockwise. - */ - - start = start % (64*360); - if (start < 0) { - start += (64*360); - } - extent = (start+extent) % (64*360); - if (extent < 0) { - extent += (64*360); - } - if (clockwise) { - int tmp = start; - start = extent; - extent = tmp; - } - radian_start = XAngleToRadians(start); - radian_end = XAngleToRadians(extent); - - /* - * Now compute points on the radial lines that define the starting and - * ending angles. Be sure to take into account that the y-coordinate - * system is inverted. - */ - - if (gc->fill_style == FillStippled && gc->stipple != None) { - xr = width / 2.0; - yr = height / 2.0; - } - else { - xr = x + width / 2.0; - yr = y + height / 2.0; - } - xstart = (int)((xr + cos(radian_start)*width/2.0) + 0.5); - ystart = (int)((yr + sin(-radian_start)*height/2.0) + 0.5); - xend = (int)((xr + cos(radian_end)*width/2.0) + 0.5); - yend = (int)((yr + sin(-radian_end)*height/2.0) + 0.5); - - /* - * Now draw a filled or open figure. Note that we have to - * increase the size of the bounding box by one to account for the - * difference in pixel definitions between X and Windows. - */ - - pen = SetUpGraphicsPort(gc); - oldPen = SelectObject(dc, pen); - if (!fill) { - /* - * Note that this call will leave a gap of one pixel at the - * end of the arc for thin arcs. We can't use ArcTo because - * it's only supported under Windows NT. - */ - - SetBkMode(dc, TRANSPARENT); - Arc(dc, x, y, x+width+1, y+height+1, xstart, ystart, xend, yend); - } else { - brush = CreateSolidBrush(gc->foreground); - - if (gc->fill_style == FillStippled && gc->stipple != None) { - TkWinDrawable *twdPtr = (TkWinDrawable *)gc->stipple; - HBITMAP oldBitmap; - HDC dcMem; - HBRUSH oldMemBrush; - - if (twdPtr->type != TWD_BITMAP) { - Tcl_Panic("unexpected drawable type in stipple"); - } - - /* - * Select stipple pattern into destination dc. - */ - SetBrushOrgEx(dc, gc->ts_x_origin, gc->ts_y_origin, NULL); - oldBrush = SelectObject(dc, - CreatePatternBrush(twdPtr->bitmap.handle)); - - /* - * Create temporary drawing surface containing a copy of the - * destination equal in size to the bounding box of the object. - */ - dcMem = CreateCompatibleDC(dc); - oldBitmap = SelectObject(dcMem, - CreateCompatibleBitmap(dc, width, height)); - BitBlt(dcMem, 0, 0, width, height, dc, x, y, SRCCOPY); - oldMemBrush = SelectObject(dcMem, brush); - if (gc->arc_mode == ArcChord) { - Chord(dcMem, 0, 0, width+1, height+1, xstart, ystart, xend, yend); - } else if ( gc->arc_mode == ArcPieSlice ) { - Pie(dcMem, 0, 0, width+1, height+1, xstart, ystart, xend, yend); - } - - BitBlt(dc, x, y, width, height, dcMem, 0, 0, COPYFG); - DeleteObject(SelectObject(dcMem, oldBitmap)); - DeleteObject(SelectObject(dcMem, oldMemBrush)); - DeleteObject(SelectObject(dc, oldBrush)); - DeleteDC(dcMem); - } else { - oldBrush = SelectObject(dc, brush); - if (gc->arc_mode == ArcChord) { - Chord(dc, x, y, x+width+1, y+height+1, xstart, ystart, xend, yend); - } else if ( gc->arc_mode == ArcPieSlice ) { - Pie(dc, x, y, x+width+1, y+height+1, xstart, ystart, xend, yend); - } - DeleteObject(SelectObject(dc, oldBrush)); - } - } - DeleteObject(SelectObject(dc, oldPen)); - TkWinReleaseDrawableDC(d, dc, &state); -} - -/* - *---------------------------------------------------------------------- - * - * XDrawArc -- - * - * Draw an arc. - * - * Results: - * None. - * - * Side effects: - * Draws an arc on the specified drawable. - * - *---------------------------------------------------------------------- - */ - -void -XDrawArc(display, d, gc, x, y, width, height, start, extent) - Display* display; - Drawable d; - GC gc; - int x; - int y; - unsigned int width; - unsigned int height; - int start; - int extent; -{ - display->request++; - - DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0); -} - -/* - *---------------------------------------------------------------------- - * - * XFillArc -- - * - * Draw a filled arc. - * - * Results: - * None. - * - * Side effects: - * Draws a filled arc on the specified drawable. - * - *---------------------------------------------------------------------- - */ - -void -XFillArc(display, d, gc, x, y, width, height, start, extent) - Display* display; - Drawable d; - GC gc; - int x; - int y; - unsigned int width; - unsigned int height; - int start; - int extent; -{ - display->request++; - - DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1); -} - -#endif /* _WIN32 */ diff --git a/win/makefile.vc.in b/win/makefile.vc.in deleted file mode 100644 index a11dc34..0000000 --- a/win/makefile.vc.in +++ /dev/null @@ -1,124 +0,0 @@ -# Generated automatically from Makefile.in by configure. -# Copyright (c) 1993 - 2005 CENA, Patrick Lecoanet -- -# -# See the file "Copyright" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# $Revision$ -# -srcdir = .. -TCLTK_FULL_VER = 8.4.9 -TCLTK_LIB_VER = 84 -TKZINC_MAJOR = @MAJOR_VERSION@ -TKZINC_MINOR = @MINOR_VERSION@ -TKZINC_PATCHLVL = @PATCHLEVEL@ - -CC = cl -LD = link -CP = copy -RM = del -# -# The SDK lib path should be available in the -# environment variable %LIB% -libpath32 = /LIBPATH:"$(LIB)" -# -# The SDK include path should be available in the -# environment variable %INCLUDE% -include32 = /I"$(INCLUDE)" /I"C:\Program Files\Microsoft Platform SDK for Windows XP SP2\include\GL" - -# -# Default location for ActiveTcl -prefix = c:\Tcl -exec_prefix = $(prefix) - -bindir = $(exec_prefix)\bin -libdir = $(exec_prefix)\lib -incdir = $(prefix)\include -mandir = $(prefix)\man\man3 - -windir = $(srcdir)\win -genericdir = $(srcdir)\generic -tmpdir = buildtcl - -tcl_inc_dir = $(srcdir)\..\tcl$(TCLTK_FULL_VER) -tk_inc_dir = $(srcdir)\..\tk$(TCLTK_FULL_VER) -INCLUDES = /I$(srcdir)/generic $(include32) - -# Assume that WISH is already INSTALLED -TCLSH = $(bindir)\tclsh$(TCLTK_LIB_VER) -WISH = $(bindir)\wish$(TCLTK_LIB_VER) -WIN_LIBS = user32.lib gdi32.lib ws2_32.lib -GL_LIBS = glu32.lib opengl32.lib -TKLIBS = $(libdir)\tcl$(TCLTK_LIB_VER).lib \ - $(libdir)\tk$(TCLTK_LIB_VER).lib \ - $(GL_LIBS) $(WIN_LIBS) - -VERSION = \"$(TKZINC_MAJOR).$(TKZINC_MINOR).$(TKZINC_PATCHLVL)\" - -# -# Recognized compilation time flags are : -# -# PROFILE ask for profile support -# OM include code for internal overlap manager -# ATC include code for atc specific items -# GL include code that need GL support. -# GL_PRINT_CONFIG display the detected hardware capabilities -# GL_DAMAGE redraw only modified areas -# SHAPE include code for reshaping windows. -# -DFLAGS= /DOM /DATC /DGL /DGL_DAMAGE /DGL_PRINT_CONFIG -#DFLAGS= /DOM -#DFLAGS = /DTCL_MEM_DEBUG - -# Max speed -#CDEBUG = /O2 /G6 /Gs -# Debug -CDEBUG = /Z7 -Od -CFLAGS = /c /W3 /nologo /YX $(CDEBUG) /D__STDC__ /DVERSION=$(VERSION) /DDLL_BUILD /DBUILD_Tkzinc $(DFLAGS) -TKCPPFLAGS = /Fp$(tmpdir)\ $(INCLUDES) /I"$(incdir)" /I$(tk_inc_dir)\generic /I$(tk_inc_dir)\win /I$(tcl_inc_dir)\generic /I$(tcl_inc_dir)\win /I$(tk_inc_dir)\xlib /D__STDC__ - -#LFLAGS = /DEBUG /nologo /machine:IX86 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib -LFLAGS = /nologo /machine:IX86 $(libpath32) /FORCE:MULTIPLE /NODEFAULTLIB:uuid.lib /NODEFAULTLIB:OLDNAMES.lib - -DLLENTRY = @12 -DLLLFLAGS = $(LFLAGS) /entry:_DllMainCRTStartup$(DLLENTRY) /dll - -TKDLLOBJS = $(tmpdir)\Track.obj $(tmpdir)\Tabular.obj \ - $(tmpdir)\Reticle.obj $(tmpdir)\Map.obj \ - $(tmpdir)\Rectangle.obj $(tmpdir)\Arc.obj \ - $(tmpdir)\Curve.obj $(tmpdir)\Item.obj \ - $(tmpdir)\PostScript.obj \ -# $(tmpdir)\perfos.obj \ - $(tmpdir)\MapInfo.obj $(tmpdir)\Attrs.obj \ - $(tmpdir)\Draw.obj $(tmpdir)\Geo.obj \ - $(tmpdir)\List.obj $(tmpdir)\Transfo.obj \ - $(tmpdir)\Group.obj $(tmpdir)\Icon.obj \ - $(tmpdir)\Text.obj $(tmpdir)\Color.obj \ - $(tmpdir)\Field.obj $(tmpdir)\Triangles.obj \ - $(tmpdir)\Window.obj $(tmpdir)\tkZinc.obj \ - $(tmpdir)\OverlapMan.obj $(tmpdir)\WinPort.obj \ - $(tmpdir)\Image.obj - -DLL=Tkzinc$(TKZINC_MAJOR)$(TKZINC_MINOR)$(TKZINC_PATCHLVL).dll - -$(tmpdir)/$(DLL): $(tmpdir) $(TKDLLOBJS) - $(LD) $(DLLLFLAGS) $(TKLIBS) /OUT:$@ $(TKDLLOBJS) - @"$(WISH)" << - package require Tk - pkg_mkIndex -load Tk $(tmpdir) $(DLL) - exit -<< - -$(tmpdir): - mkdir $(tmpdir) - -{$(windir)}.c{$(tmpdir)}.obj: - $(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $< - -{$(genericdir)}.c{$(tmpdir)}.obj: - $(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $< - -mostlyclean: - $(RM) *.bak *~ $(tmpdir)\*.obj -clean: - $(RM) $(tmpdir)\*.obj $(tmpdir)\*.dll $(tmpdir)\*.lib $(tmpdir)\*.exp $(tmpdir)\pkgIndex.tcl $(tmpdir)\*.pch diff --git a/win/package.tcl b/win/package.tcl deleted file mode 100644 index fe27187..0000000 --- a/win/package.tcl +++ /dev/null @@ -1,320 +0,0 @@ -# -# This script is intended to be run in the win sub-directory -# with: tclsh build.tcl -# actions include: tcl, perl, doc, wrap, clean. If nothing -# is specified all actions are performed in order. - -set todo [lindex $argv 0] - -set root [file join [file dirname [info script]] ..] - -# -# First get the configure variable values. -# -set fid [open [file join $root configure.in]] -while { ! [eof $fid] } { - set line [gets $fid] - if { [regexp {^MAJOR_VERSION=(.*)$} $line dummy major] } { - continue - } - if { [regexp {^MINOR_VERSION=(.*)$} $line dummy minor] } { - continue - } - if { [regexp {^PATCHLEVEL=(.*)$} $line dummy patchlevel] } { - continue - } - if { [regexp {^VERSION=(.*)$} $line dummy version] } { - continue - } - if { [regexp {^PACKAGE=(.*)$} $line dummy package] } { - continue - } - if { [regexp {^Tkzinc_LIB_FILE=(.*)$} $line dummy libFile] } { - continue - } - if { [regexp {^Tkzincstub_LIB_FILE=(.*)$} $line dummy stubLibFile] } { - continue - } -} -close $fid - -if { $todo eq "subst" || $todo eq "" } { - # - # Substitute @variables@ in the .in registred files - # producing their expanded equivalent into files - # without the .in extension. - # - puts "Performing configuration variables substitution..." - - set registredFiles { - { Python/library Zinc.py } - { . starkit.tcl } - { win makefile.vc } - { win Tkzinc.wxs } - } - - set libFile "${package}${major}${minor}.dll" - set stubLibFile "${package}stub${major}${minor}.dll" - - # - # Then substitute all occurences in known files - # - foreach t $registredFiles { - set fid [open [file join $root [lindex $t 0] [lindex $t 1].in]] - set fod [open [file join $root [lindex $t 0] [lindex $t 1]] w] - - while { ! [eof $fid] } { - set line [gets $fid] - regsub -all {@MAJOR_VERSION@} $line $major line - regsub -all {@MINOR_VERSION@} $line $minor line - regsub -all {@PATCHLEVEL@} $line $patchlevel line - regsub -all {@VERSION@} $line $version line - regsub -all {@PACKAGE@} $line $package line - regsub -all {@Tkzinc_LIB_FILE@} $line $libFile line - regsub -all {@Tkzincstub_LIB_FILE@} $line $stubLibFile line - puts $fod $line - } - - close $fid - close $fod - } -} - -if { $todo eq "tcl" || $todo eq "" } { - # - # Make the Tcl library - # - set tmpdir buildtcl - - puts "Compiling the tcl variant..." - - if { [catch {exec nmake -f makefile.vc 2>log} result] } { - puts $result - exit - } - - # - # Copy the library files, it makes it easier to test in situ. - # - foreach f [glob -directory [file join $root library] zinc*.tcl] { - file copy -force $f $tmpdir - } - # - # Build a merged pkgIndex.tcl - # - set fout [open [file join $tmpdir pkgIndex.tcl] a] - set fin [open [file join $root library pkgIndex.tcl]] - foreach line [split [read $fin] \n] { - if {![regexp {^\s*$|^#} $line]} { - puts $fout $line - } - } - close $fin - close $fout - - # - # Create a demo script ending in .tcl - # - file copy -force [file join $root demos zinc-widget] [file join $tmpdir zinc-widget.tcl] -} - -if { $todo eq "perl" || $todo eq "" } { - # - # Make the Tkzinc Perl library for windows - # - puts "Compiling the perl variant..." - - # - # Create a perl build directory and copy the relevant - # files in it. - # - set wd [pwd] - set buildDir buildperl - set make nmake - - puts "Creating temporary build structure for Tkzinc perl variant" - - if { [file exists $buildDir] } { - file delete -force $buildDir - } - file mkdir $buildDir - - foreach f {t Zinc.xs demos README Zinc} { - file copy -force [file join $root Perl $f] $buildDir - } - # - # Add the version in Zinc.pm and Makefile.PL - foreach f {Zinc.pm Makefile.PL} { - set fid [open [file join $root Perl $f]] - set fod [open [file join $buildDir $f] w] - - while { ! [eof $fid] } { - set line [gets $fid] - regsub -all SEEexport2cpan $line [format "%d.%d%02d" $major $minor $patchlevel] line - puts $fod $line - } - - close $fid - close $fod - } - foreach f [glob -nocomplain [file join $root generic *.c] [file join $root generic *.h] \ - [file join $root win *.c] [file join $root debian changelog] \ - [file join $root debian copyright]] { - file copy -force $f $buildDir - } - - # - # Build a .bat script for the Perl demos. - # - set fout [open [file join $buildDir demos zinc-demos.bat] w] - set fin [open [file join $buildDir demos zinc-demos]] - puts $fout {@rem = '--*-Perl-*-- -@echo off -if "%OS%" == "Windows_NT" goto WinNT -perl -x -S "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto endofperl -:WinNT -perl -x -S %0 %* -if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endofperl -if %errorlevel% == 9009 echo You do not have Perl in your PATH. -if errorlevel 1 goto script_failed_so_exit_with_non_zero_val 2>nul -goto endofperl -@rem ';} - puts $fout [read $fin] - puts $fout {__END__ -:endofperl} - close $fin - close $fout - - # - # Call the perl setup and then make it. - # - puts "Compiling the perl variant" - - cd $buildDir - if { [catch {exec perl Makefile.PL 2>log} result] } { - puts $result - exit - } - if { [catch {exec $make 2>log} result] } { - puts $result - exit - } - cd $wd -} - - -proc DocClean { } { - # - # Need to get rid of some temporary files. - # - file delete -force log refman.aux refman.idx refman.ind refman.lof - file delete -force refman.log refman.out refman.toc texput.log - file delete -force idxmake.dvi idxmake.log refman.4ct refman.4dx refman.4ix - file delete -force refman.4tc refman.dvi refman.idx refman.ilg refman.ind - file delete -force refman.log refman.tmp refman.xref refman.lg refman.idv -} - -if { $todo eq "doc" || $todo eq "" } { - # - # Make the pdf manual. Run the command - # three time to make the crossrefs ok. - # - puts "Building the documentation..." - - set cwd [pwd] - cd [file join $root doc] - - DocClean - puts "First pass through pdflatex." - if { [catch {exec pdflatex refman.tex 2>log} result] } { - puts $result - exit - } - puts "Running makeindex." - if { [catch {exec makeindex -o refman.ind refman.idx 2>log} result] } { - puts $result - exit - } - puts "Second pass through pdflatex." - if { [catch {exec pdflatex refman.tex 2>log} result] } { - puts $result - exit - } - puts "Third pass through pdflatex." - if { [catch {exec pdflatex refman.tex 2>log} result] } { - puts $result - exit - } - DocClean - puts "First pass through latex." - if { [catch {exec latex refman.tex 2>log} result] } { - puts $result - exit - } - puts "Preparing the index." - if { [catch {exec tex {\def\filename{{refman}{idx}{4dx}{ind}}} {\input} idxmake.4ht 2>log} result] } { - puts $result - exit - } - puts "Running makeindex." - if { [catch {exec makeindex -o refman.ind refman.4dx 2>log} result] } { - puts $result - exit - } - puts "Second pass through latex." - if { [catch {exec latex refman.tex 2>log} result] } { - puts $result - exit - } - puts "Third pass through latex." - if { [catch {exec latex refman.tex 2>log} result] } { - puts $result - exit - } - puts "Buiding html." - if { [catch {exec tex4ht refman.tex 2>log} result] } { - puts $result - exit - } - if { [catch {exec t4ht refman.tex 2>log} result] } { - puts $result - exit - } - DocClean - - cd $cwd -} - -if { $todo eq "wrap" || $todo eq "" } { - # - # Wrap up the msi package. - # - puts "Wrapping the msi package..." - - if { [catch {exec candle Tkzinc.wxs 2>log} result] } { - puts $result - exit - } - if { [catch {exec light Tkzinc.wixobj 2>log} result] } { - puts $result - exit - } -} - -if { $todo eq "clean" || $todo eq "" } { - # - # Clean up after messing around - # - puts "Cleaning up..." - - file delete -force log pkgIndex.tcl zinc-widget.tcl zinc-demos.bat Tkzinc.wixobj - file delete -force buildtcl - file delete -force buildperl - set cwd [pwd] - cd [file join $root doc] - file delete -force refman.pdf refman.css nayk0a01.png - file delete -force [glob refman*.html] - cd $cwd -} - -- cgit v1.1