[Sciviews-commits] r263 - komodo/SciViews-K/content komodo/SciViews-K/content/js pkg/tcltk2 pkg/tcltk2/win/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun May 2 18:15:35 CEST 2010
Author: phgrosjean
Date: 2010-05-02 18:15:34 +0200 (Sun, 02 May 2010)
New Revision: 263
Modified:
komodo/SciViews-K/content/js/commands.js
komodo/SciViews-K/content/js/pref-R.js
komodo/SciViews-K/content/js/prefs.js
komodo/SciViews-K/content/js/socket.js
komodo/SciViews-K/content/pref-R.xul
pkg/tcltk2/DESCRIPTION
pkg/tcltk2/NEWS
pkg/tcltk2/cleanup.win
pkg/tcltk2/win/src/Makevars
pkg/tcltk2/win/src/Winico06.c
Log:
Further work on R interpreter mechanism... not completely fixed yet!
tcltk2 made compatible with 64bit compilation on Windows... but it breaks the current compilation process
Modified: komodo/SciViews-K/content/js/commands.js
===================================================================
--- komodo/SciViews-K/content/js/commands.js 2010-05-01 21:02:05 UTC (rev 262)
+++ komodo/SciViews-K/content/js/commands.js 2010-05-02 16:15:34 UTC (rev 263)
@@ -120,11 +120,12 @@
return;
}
-
path = os.path.dirname(path);
if (path) path += os.sep;
+ var Quiet = " ";
+ if (sv.prefs.getString("svRQuiet")) Quiet = "--quiet ";
cmd = cmd.replace("%Path%", path).replace("%cwd%", cwd)
- .replace("%title%", "SciViews-K");
+ .replace("%title%", "SciViews-K").replace("%quiet%", Quiet);
var id = sv.prefs.getString("svRApplicationId");
@@ -148,8 +149,6 @@
"koDebug=" + String(sv.socket.debug).toUpperCase(),
"koAppFile=" + sv.tools.file.path("binDir", "komodo" + (isWin? ".exe" : ""))
];
- var cwd = sv.tools.file.path("ProfD", "extensions",
- "sciviewsk at sciviews.org", "defaults");
var runIn = "no-console";
env.push("Rid=" + preferredRApp);
Modified: komodo/SciViews-K/content/js/pref-R.js
===================================================================
--- komodo/SciViews-K/content/js/pref-R.js 2010-05-01 21:02:05 UTC (rev 262)
+++ komodo/SciViews-K/content/js/pref-R.js 2010-05-02 16:15:34 UTC (rev 263)
@@ -8,7 +8,7 @@
// svPrefR_finishSpecifyingExecutable(path); // Set R executable
////////////////////////////////////////////////////////////////////////////////
//
-// TODO: use 'R' simply as default R (terminal on Win/Mac, or ? on Linux)
+// TODO: use 'R' simply as default R (terminal on Win/Mac, or on Linux)
/* TODO: prefs to include:
* address for remote R (sv.socket.host)? (if not localhost - disable source* commands)
@@ -22,8 +22,7 @@
var sv;
-
-// for editable menulists: append new element if necessarry.
+// for editable menulists: append new element if necessary
function editMenulist(el) {
var curValue = sv.tools.strings.trim(el.value);
if (!curValue) return;
@@ -70,9 +69,6 @@
}
}
-
-
-
function PrefR_menulistSetValue(menuList, value, attr, vdefault) {
var n = menuList.itemCount;
var item;
@@ -91,23 +87,22 @@
function PrefR_OnLoad() {
// Get the sv object:
var p = parent;
- while (p.opener && (p = p.opener) && !sv) if (p.sv) sv = p.sv;
+ while (p.opener && (p = p.opener) && !sv) if (p.sv) sv = p.sv;
var prefExecutable;
var prefset = parent.hPrefWindow.prefset;
var prefName = 'svRDefaultInterpreter';
+ document.getElementById("svRQuiet")
+ .setAttribute("checked", sv.prefs.getString("svRQuiet"));
if (!prefset.hasStringPref(prefName) || !prefset.getStringPref(prefName)) {
prefExecutable = sv.tools.file.whereIs("R");
prefset.setStringPref(prefName, prefExecutable);
}
PrefR_setRAppMenu(document.getElementById("svRApplication"));
-
- //PrefR_InterfaceUpdate();
if (!PrefR_UpdateCranMirrors(true))
PrefR_UpdateCranMirrors(false);
-
+
menuListSetValues();
-
parent.hPrefWindow.onpageload();
}
@@ -118,32 +113,26 @@
function OnPreferencePageOK(prefset) {
prefset = parent.hPrefWindow.prefset;
prefset.setStringPref("svRDefaultInterpreter",
- document.getElementById("svRDefaultInterpreter")
- .value);
+ document.getElementById("svRDefaultInterpreter").value);
prefset.setStringPref("svRApplication",
- document.getElementById('svRApplication')
- .selectedItem.getAttribute("data"));
+ document.getElementById('svRApplication')
+ .selectedItem.getAttribute("value"));
prefset.setStringPref("svRApplicationId",
- document.getElementById('svRApplication')
- .selectedItem.id);
+ document.getElementById('svRApplication').selectedItem.id);
+ prefset.setStringPref("svRQuiet",
+ document.getElementById('svRQuiet')
+ .getAttribute("checked") == "true");
var outDec = document.getElementById('r.csv.dec').value;
var outSep = document.getElementById('r.csv.sep').value;
-
prefset.setStringPref("r.csv.dec.arg", '"' + outDec +'"');
prefset.setStringPref("r.csv.sep.arg", '"' + outSep +'"');
-
- //alert(sv.tools.strings.addslashes(outDec));
-
if (sv.r.running) {
sv.r.eval('options(OutDec = "' + outDec + '", ' +
- 'OutSep = "' + outSep + '")', true);
+ 'OutSep = "' + outSep + '")', true);
}
-
-
-
+
menuListGetValues();
-
return true;
}
@@ -166,8 +155,15 @@
document.getElementById("svRDefaultInterpreter").value
= svRDefaultInterpreter;
+ var Quiet = " ";
+ if (document.getElementById("svRQuiet")
+ .getAttribute("checked") == "true") Quiet = "--quiet ";
+
+ var cwd = sv.tools.file.path("ProfD", "extensions",
+ "sciviewsk at sciviews.org", "defaults");
+
data = data.replace("%Path%", path).replace("%title%", "SciViews-K")
- .replace("%cwd%", os.getcwd());
+ .replace("%cwd%", cwd).replace("%quiet%", Quiet);
document.getElementById('R_command').value = data;
return true;
@@ -183,7 +179,7 @@
}
PrefR_menulistSetValue(document.getElementById("svRApplication"),
- os.path.basename(path), "app", "R");
+ os.path.basename(path), "app", "R");
document.getElementById("svRDefaultInterpreter").value = os.path.abspath(path);
PrefR_svRApplicationOnSelect(null);
}
@@ -195,12 +191,12 @@
var validPlatforms, showItem;
var platform = navigator.platform;
+ var anyItem = false;
for (var i = menuList.itemCount; i >= 0; i--) {
var item = menuList.getItemAtIndex(i);
try {
- validPlatforms = item.getAttribute("platform").
- split(/[,\s]+/);
+ validPlatforms = item.getAttribute("platform").split(/[,\s]+/);
showItem = false;
for (var j in validPlatforms) {
if (platform.indexOf(validPlatforms[j]) > -1) {
@@ -224,11 +220,17 @@
}
}
}
- if (!showItem)
+ if (!showItem) {
menuList.removeItemAt(i);
- } catch(e) { }
+ } else {
+ anyItem = true;
+ }
+ } catch(e) { }
}
-
+ // If there is at least one item available, hide the message to install R
+ if (anyItem) {
+ document.getElementById("svRinstallMessage").setAttribute("hidden", "true");
+ }
}
// Get CRAN mirrors list - independently of R
@@ -254,7 +256,8 @@
var alreadyCached = false;
if (!csvContent) {
// First, check if there is serialized version:
- if (alreadyCached = sv_file.exists(jsonFile)) {
+ alreadyCached = sv_file.exists(jsonFile);
+ if (alreadyCached) {
arrData = nativeJSON.decode(sv_file.read(jsonFile));
//sv.cmdout.append("Read from: JSON");
} else {
@@ -294,7 +297,6 @@
arrData[i] = [item[colName], item[colURL]];
}
}
- //sv.cmdout.append("New arrData");
}
if (!arrData) return false;
@@ -302,7 +304,6 @@
// If updated from web, or not cached yet,
// serialize and save to file for faster later use:
sv_file.write(jsonFile, nativeJSON.encode(arrData), 'utf-8');
- //sv.cmdout.append("Cached now.");
}
// Put arrData into MenuList:
@@ -329,20 +330,21 @@
"([^\"\\" + strDelimiter + "\\r\\n]*))"
), "gi");
var arrData = [[]];
- var arrMatches = null;
- while (arrMatches = objPattern.exec( strData )) {
- var strMatchedDelimiter = arrMatches[ 1 ];
+ var arrMatches = objPattern.exec(strData);
+ while (arrMatches) {
+ var strMatchedDelimiter = arrMatches[1];
if (strMatchedDelimiter.length &&
(strMatchedDelimiter != strDelimiter)) {
- arrData.push( [] );
+ arrData.push([]);
}
- if (arrMatches[ 2 ]){
- var strMatchedValue = arrMatches[ 2 ].replace(
- new RegExp( "\"\"", "g" ), "\"");
+ if (arrMatches[2]) {
+ var strMatchedValue = arrMatches[2]
+ .replace(new RegExp( "\"\"", "g" ), "\"");
} else {
- var strMatchedValue = arrMatches[ 3 ];
+ var strMatchedValue = arrMatches[3];
}
- arrData[ arrData.length - 1 ].push( strMatchedValue );
+ arrData[arrData.length - 1].push(strMatchedValue);
+ arrMatches = objPattern.exec(strData);
}
- return( arrData );
+ return(arrData);
}
Modified: komodo/SciViews-K/content/js/prefs.js
===================================================================
--- komodo/SciViews-K/content/js/prefs.js 2010-05-01 21:02:05 UTC (rev 262)
+++ komodo/SciViews-K/content/js/prefs.js 2010-05-02 16:15:34 UTC (rev 263)
@@ -79,7 +79,7 @@
// R interpreter
sv.prefs.setString("svRDefaultInterpreter", "", false);
sv.prefs.setString("svRApplication", null, false);
-
+sv.prefs.setString("svRQuiet", false, false);
var svRDefaultInterpreter = sv.prefs.getString("svRDefaultInterpreter", "");
// Default R interpreter Id: use a reasonable default, given the platform
@@ -98,7 +98,6 @@
sv.prefs.setString("CRANMirror", "http://cran.r-project.org/", false);
sv.prefs.setString("RHelpCommand", "javascript:sv.r.help(\"%w\")", false);
-
// This is required by sv.helpContext() for attaching help to snippets (hack!)
// Create empty preference sets to be used with snippet help system hack
// [[%pref:R-help:value]] which displays nothing when the snippet is used
@@ -149,7 +148,6 @@
sv.prefs.mru("factor2", true, "");
sv.prefs.mru("blockFactor", true, "");
-
//// (re)initialize a series of MRU for snippets' %ask constructs //////////////
// TODO: defaultMRU for ts, data, table, ...
Modified: komodo/SciViews-K/content/js/socket.js
===================================================================
--- komodo/SciViews-K/content/js/socket.js 2010-05-01 21:02:05 UTC (rev 262)
+++ komodo/SciViews-K/content/js/socket.js 2010-05-02 16:15:34 UTC (rev 263)
@@ -215,7 +215,7 @@
const nsITransport = Components.interfaces.nsITransport;
- var _serverSocket; // The SviViews-K socket server object
+ var _serverSocket; // The SciViews-K socket server object
var _serverStarted = false; // Is the socket server started?
var _inputString; // The string with command send by R
var _outputString; // The string with the result to send to R
Modified: komodo/SciViews-K/content/pref-R.xul
===================================================================
--- komodo/SciViews-K/content/pref-R.xul 2010-05-01 21:02:05 UTC (rev 262)
+++ komodo/SciViews-K/content/pref-R.xul 2010-05-02 16:15:34 UTC (rev 263)
@@ -43,7 +43,6 @@
<?xml-stylesheet href="chrome://komodo/skin/tree.css" type="text/css"?>
<?xml-stylesheet href="chrome://komodo/skin/prefs/prefs.css" type="text/css"?>
-
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="kodialog" orient="vertical" onload="PrefR_OnLoad(event);">
@@ -57,16 +56,10 @@
<box class="kobox-smallheader" title="R interpreter configuration"/>
<vbox flex="1" class="autoscroll">
+
<groupbox orient="vertical">
<caption label="Default R Interpreter"/>
- <label value="Use this R application:" control="svRDefaultInterpreter" />
- <hbox>
- <textbox id="svRDefaultInterpreter" pref="true"
- emptytext="No R installation found on the system!"
- editable="false" flex="1"/>
- <button label="Browse..." oncommand="PrefR_setExecutable();"/>
- </hbox>
- <vbox flex="1" align="center">
+ <vbox flex="1" id="svRinstallMessage" align="center">
<description>
SciViews-K needs a valid installation of R on the
local machine. If you have not installed R yet, you can
@@ -74,75 +67,132 @@
</description>
<separator class="thin"/>
<button label="<http://cran.r-project.org/>" class="button-link"
- style="margin-top: -10px; color: rgb(184, 38, 25);"
- onclick="parent.opener.ko.browse.openUrlInDefaultBrowser('http://cran.r-project.org/');"/>
+ style="margin-top: -10px; color: rgb(184, 38, 25);"
+ onclick="parent.opener.ko.browse.openUrlInDefaultBrowser('http://cran.r-project.org/');"/>
<separator class="thin"/>
</vbox>
<hbox align="center">
<label class="label" control="svRApplication" value="Preferred way to run R:"/>
<menulist
- id="svRApplication" oncommand="PrefR_svRApplicationOnSelect(event);"
- pref="true" prefattribute="value"
- >
- <menupopup id="sciviews_menu_select_r_application">
- <menuitem id="r-none" label=""
+ id="svRApplication" oncommand="PrefR_svRApplicationOnSelect(event);"
+ pref="true" prefattribute="value">
+ <menupopup id="sciviews_menu_select_r_application">
+ <menuitem id="r-none" label=""
value="" app="?" which="" platform="Linux,Mac,Win"/>
- <menuitem id="r-terminal" label="in default terminal"
- value=""%Path%R" --quiet" which="R"
+ <menuitem id="r-terminal" label="in default terminal"
+ value=""%Path%R" %quiet%" which="R"
platform="Linux,Mac"/>
- <menuitem id="r-terminal" label="in console window"
- value=""%Path%R.exe" --quiet" app="R.exe"
+ <menuitem id="r-terminal" label="in console window"
+ value=""%Path%R.exe" %quiet%" app="R.exe"
which="R" platform="Win"/>
- <menuitem id="r-gnome-term" label="in Gnome terminal"
- value="gnome-terminal --hide-menubar --title=%title% -x "%Path%R" --quiet"
+ <menuitem id="r-gnome-term" label="in Gnome terminal"
+ value="gnome-terminal --hide-menubar --title=%title% -x "%Path%R" %quiet%"
which="gnome-terminal,R" platform="Linux"/>
- <menuitem id="r-kde-term" label="in Konsole"
- value="konsole --workdir "%cwd%" --title %title% -e "%Path%R" --quiet"
+ <menuitem id="r-kde-term" label="in Konsole"
+ value="konsole --workdir "%cwd%" --title %title% -e "%Path%R" %quiet%"
which="konsole,R" platform="Linux"/>
- <menuitem id="r-xfce4-term" label="in XFCE terminal"
- value="xfce4-terminal --title "%title%" -x "%Path%R" --quiet"
+ <menuitem id="r-xfce4-term" label="in XFCE terminal"
+ value="xfce4-terminal --title "%title%" -x "%Path%R" %quiet%"
which="xfce4-terminal,R" platform="Linux"/>
- <menuitem id="r-app" label="R app"
+ <menuitem id="r-app" label="R app"
value="open -a "/Applications/R.app" "%cwd%""
app="R.app"
which="/Applications/R.app" platform="Mac"/>
- <menuitem id="r64-app" label="R64 app"
+ <menuitem id="r64-app" label="R64 app"
value="open -a "/Applications/R64.app" "%cwd%""
app="R64.app"
which="/Applications/R64.app" platform="Mac"/>
- <menuitem id="svr-app" label="SciViews R app"
+ <menuitem id="svr-app" label="SciViews R app"
value="open -a "/Applications/SciViews R.app" "%cwd%""
app="SciViews R.app"
which="/Applications/SciViews R.app" platform="Mac"/>
- <menuitem id="svr64-app" label="SciViews R64 app"
+ <menuitem id="svr64-app" label="SciViews R64 app"
value="open -a "/Applications/SciViews R64.app" "%cwd%""
app="SciViews R64.app"
which="/Applications/SciViews R64.app" platform="Mac"/>
- <menuitem id="r-gui" label="R GUI"
+ <menuitem id="r-gui" label="R GUI"
app="Rgui.exe"
- value=""%Path%Rgui.exe" --sdi"
+ value=""%Path%Rgui.exe" --sdi %quiet%"
which="Rgui" platform="Win"/>
- <menuitem id="r-tk" label="R Tk GUI"
- value=""%Path%R" --interactive --gui=Tk"
+ <menuitem id="r-tk" label="R Tk GUI"
+ value=""%Path%R" --interactive --gui=Tk %quiet%"
which="R" platform="Linux,Mac"/>
- </menupopup>
+ </menupopup>
</menulist>
</hbox>
+ <label value="Use this R application:" control="svRDefaultInterpreter" />
+ <hbox>
+ <textbox id="svRDefaultInterpreter" pref="true"
+ emptytext="No R installation found on the system!"
+ oninput="PrefR_svRApplicationOnSelect(event);"
+ editable="false" flex="1"/>
+ <button label="Browse..." oncommand="PrefR_setExecutable();"/>
+ </hbox>
<hbox align="center">
- <checkbox id="sciviews.run.r.quiet" disabled="true" />
+ <checkbox id="svRQuiet" oninput="PrefR_svRApplicationOnSelect(event);"/>
<label value="Run R quietly (no initial messages)"
- control="sciviews.run.r.quiet" disabled="true"
- pref="false" />
+ control="svRQuiet" pref="false" />
</hbox>
<separator class="thin"/>
<vbox>
-<label class="label" control="R_command" crop="end"
- value="This command will be used to start R (R -> Start R):"/>
+ <label class="label" control="R_command" crop="end"
+ value="This command will be used to start R (R -> Start R):"/>
<textbox id="R_command" value="" class="plain"
- style="background: none; padding-top: 1px !important; margin-left: 10px !important;" />
+ style="background: none; padding-top: 1px !important; margin-left: 10px !important;" />
</vbox>
</groupbox>
+
<groupbox orient="vertical">
+ <caption label="Socket connection"/>
+ <grid>
+ <columns>
+ <column flex="1"/> <column flex="2"/> <column flex="1"/> <column
+ flex="2"/>
+ </columns>
+ <rows>
+ <row align="center">
+ <label value="Server port #:" control="sciviews.client.socket" />
+ <textbox id="sciviews.client.socket" pref="true" width="50" />
+ <label value="Host to connect to:" control="sciviews.server.host" />
+ <textbox id="sciviews.server.host" pref="true" width="150"
+ disabled="true"/>
+ </row>
+ <row align="center">
+ <label value="Client port #:" control="sciviews.server.socket" />
+ <textbox id="sciviews.server.socket" pref="true" width="50" />
+ <label value="Client Id:" control="sciviews.client.id" />
+ <textbox id="sciviews.client.id" pref="true" width="150" />
+ </row>
+ </rows>
+ </grid>
+ </groupbox>
+
+ <groupbox orient="vertical">
+ <caption label="Data input and output"/>
+ <grid>
+ <columns>
+ <column flex="3"/> <column flex="3"/> <column flex="3"/>
+ </columns>
+ <rows>
+ <row align="center">
+ <label value="Decimal separator" control="r.csv.dec"/>
+ <menulist pref="true" id="r.csv.dec"
+ values=", ." persist="values">
+ <menupopup />
+ </menulist>
+ <label value="CSV field separator" control="r.csv.sep" />
+ <menulist pref="true" id="r.csv.sep" editable="true"
+ onkeyup="if (event.keyCode == 13) editMenulist(this);"
+ onblur="editMenulist(this);"
+ values=", ; \t" persist="values">
+ <menupopup />
+ </menulist>
+ </row>
+ </rows>
+ </grid>
+ </groupbox>
+
+ <groupbox orient="vertical">
<caption label="R configuration"/>
<vbox>
<hbox align="center">
@@ -155,14 +205,15 @@
</hbox>
</vbox>
</groupbox>
- <groupbox orient="vertical">
+
+ <groupbox orient="vertical" hidden="true">
<caption label="Miscellanous"/>
<hbox align="top">
<label value="Show R help in:" />
<radiogroup id="sciviews.rhelp.open_in" disabled="true"
- pref="false">
+ pref="false">
<radio value="window" label="new window" accesskey="E"
- selected="true" />
+ selected="true" />
<radio value="pane" label="right pane" accesskey="P" />
</radiogroup>
</hbox>
@@ -170,67 +221,10 @@
<hbox align="center">
<checkbox id="sciviews.r.auto-start" disabled="true" />
<label value="Start R automatically"
- control="sciviews.r.auto-start" disabled="true"
- pref="false" />
+ control="sciviews.r.auto-start" disabled="true"
+ pref="false" />
</hbox>
</groupbox>
- <groupbox orient="vertical">
- <caption label="Socket connection"/>
- <grid>
- <columns>
- <column flex="1"/> <column flex="2"/> <column flex="1"/> <column
- flex="2"/>
- </columns>
- <rows>
- <row align="center">
- <label value="Server port #:" control="sciviews.client.socket" />
- <textbox id="sciviews.client.socket" pref="true" width="50" />
- <label value="Host to connect to:" control="sciviews.server.host" />
- <textbox id="sciviews.server.host" pref="true" width="150"
- disabled="true"/>
- </row>
- <row align="center">
- <label value="Client port #:" control="sciviews.server.socket" />
- <textbox id="sciviews.server.socket" pref="true" width="50" />
- <label value="Client Id:" control="sciviews.client.id" />
- <textbox id="sciviews.client.id" pref="true" width="150" />
- </row>
- </rows>
- </grid>
- </groupbox>
- <groupbox orient="vertical">
- <caption label="Data input and output"/>
- <grid>
- <columns>
- <column flex="3"/> <column flex="3"/> <column flex="3"/>
- </columns>
- <rows>
- <row align="center">
- <label value="Decimal separator" control="r.csv.dec" />
- <menulist pref="true" id="r.csv.dec"
- values=", ." persist="values"
- >
- <menupopup />
- </menulist>
-
- <label value="CSV field separator" control="r.csv.sep" />
-
- <!--PhG: this raises an error when included in the <menulist ...> tag hereunder! oninput="this.value = this.value[0];"-->
-
- <menulist pref="true" id="r.csv.sep"
- editable="true"
-
- onkeyup="if (event.keyCode == 13) editMenulist(this);"
- onblur="editMenulist(this);"
- values=", ; \t" persist="values"
- >
- <menupopup />
- </menulist>
- </row>
- </rows>
- </grid>
- </groupbox>
-
-
+
</vbox>
</window>
Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION 2010-05-01 21:02:05 UTC (rev 262)
+++ pkg/tcltk2/DESCRIPTION 2010-05-02 16:15:34 UTC (rev 263)
@@ -8,8 +8,8 @@
Description: A series of additional Tcl commands and Tk widgets with style
and various functions (under Windows: DDE exchange, access to the
registry and icon manipulation) to supplement the tcltk package
-Version: 1.1-2
-Date: 2010-02-10
+Version: 1.1-3
+Date: 2010-05-02
Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
License: file LICENSE
Modified: pkg/tcltk2/NEWS
===================================================================
--- pkg/tcltk2/NEWS 2010-05-01 21:02:05 UTC (rev 262)
+++ pkg/tcltk2/NEWS 2010-05-02 16:15:34 UTC (rev 263)
@@ -1,5 +1,11 @@
= tcltk2 news
+== Version 1.1-3
+
+* New /win/src/Makevars to make it compatible with the double compilation for
+ Windows 32bit and 64bit. Thanks Prof. Brian Ripley.
+
+
== Version 1.1-2
* Patch to .onload() and to source code of Winico0.6.c submitted by Prof. Brian
Modified: pkg/tcltk2/cleanup.win
===================================================================
--- pkg/tcltk2/cleanup.win 2010-05-01 21:02:05 UTC (rev 262)
+++ pkg/tcltk2/cleanup.win 2010-05-02 16:15:34 UTC (rev 263)
@@ -3,11 +3,11 @@
# With R < 2.9.0, the package dir is in ${DPKG} (*undocumented variable*)!
# Starting from R 2.9.0, it is ${R_PACKAGE_DIR}, and it is documented!
# Tested with R 2.9.1... it doesn't work => temporary disabled!
-#if test -z "${R_PACKAGE_DIR}"; then
+if test -z "${R_PACKAGE_DIR}"; then
cp src/Winico06.dll "${DPKG}/tklibs/winico0.6/Winico06.dll"
-#else
-# cp src/Winico06.dll "${R_PACKAGE_DIR}/tklibs/winico0.6/Winico06.dll"
-#fi
+else
+ cp src/Winico06.dll "${R_PACKAGE_DIR}/tklibs/winico0.6/Winico06.dll"
+fi
rm -R -f inst/tklibs/winico0.6
rm -R -f src
Modified: pkg/tcltk2/win/src/Makevars
===================================================================
--- pkg/tcltk2/win/src/Makevars 2010-05-01 21:02:05 UTC (rev 262)
+++ pkg/tcltk2/win/src/Makevars 2010-05-02 16:15:34 UTC (rev 263)
@@ -1,2 +1,2 @@
-PKG_CPPFLAGS = -I${R_HOME}/Tcl/include
-PKG_LIBS = -L${R_HOME}/Tcl/bin -ltcl85 -ltk85 -lgdi32 -luser32 -o Winico06.dll
\ No newline at end of file
+PKG_CPPFLAGS = -I"${TCL_HOME}"/include
+PKG_LIBS = -L"${TCL_HOME}"/bin$(TCLBIN) -ltcl$(TCL_VERSION) -ltk$(TCL_VERSION) -lgdi32 -luser32 -o Winico06.dll
\ No newline at end of file
Modified: pkg/tcltk2/win/src/Winico06.c
===================================================================
--- pkg/tcltk2/win/src/Winico06.c 2010-05-01 21:02:05 UTC (rev 262)
+++ pkg/tcltk2/win/src/Winico06.c 2010-05-02 16:15:34 UTC (rev 263)
@@ -1020,7 +1020,7 @@
}
ckfree((char *) icoPtr);
}
-static IcoInfo* GetIcoPtr(Tcl_Interp* interp,char* string){
+static IcoInfo* GetIcoPtr(Tcl_Interp* interp, char* string){
IcoInfo *icoPtr;
int id;
char *end;
More information about the Sciviews-commits
mailing list