Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Repaired Makefile |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9589f9abfc5a142cf018e64a73e0178d |
User & Date: | peter 2016-04-13 21:44:57.416 |
Context
2016-04-14
| ||
12:52 | Corrected CVS detection check-in: bf725897bf user: peter tags: trunk | |
2016-04-13
| ||
21:44 | Repaired Makefile check-in: 9589f9abfc user: peter tags: trunk | |
14:09 | Allow plugin to know file names. Use source file with pdftotext in PDF plugin since stdin is not reliable there. check-in: 44c31b0e2b user: peter tags: trunk | |
Changes
Changes to Makefile.
1 2 3 4 5 6 7 | #---------------------------------------------------------------------- # Make file for Eskil #---------------------------------------------------------------------- VERSION = 271 # Path to the TclKits used for creating StarPacks. | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #---------------------------------------------------------------------- # Make file for Eskil #---------------------------------------------------------------------- VERSION = 271 # Path to the TclKits used for creating StarPacks. TCLKIT = /home/peter/tclkit/v85 TCLKIT_LINUX = $(TCLKIT)/tclkit-linux TCLKIT_SOLARIS = $(TCLKIT)/tclkit-solaris-sparc TCLKIT_WIN = $(TCLKIT)/tclkit-win32.upx.exe TCLKIT_MAC = $(TCLKIT)/tclkit-mac-864 # Paths to the libraries used. # If you do not have access to all these, you can get them from an Eskil kit # as explained below. TEXTSEARCH = /home/peter/src/textsearch DIFFUTIL = /home/peter/src/DiffUtilTcl/lib.vfs/DiffUtil |
︙ | ︙ | |||
189 190 191 192 193 194 195 | @rm -f $(LOGFILES) $(IFILES) $(MFILES) #---------------------------------------------------------------- # Packaging/Releasing #---------------------------------------------------------------- wrap: | | | | | | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | @rm -f $(LOGFILES) $(IFILES) $(MFILES) #---------------------------------------------------------------- # Packaging/Releasing #---------------------------------------------------------------- wrap: sdx wrap eskil.kit wrapexe: @\rm -f eskil.linux eskil.exe eskil.solaris sdx wrap eskil.linux -runtime $(TCLKIT_LINUX) sdx wrap eskil.mac -runtime $(TCLKIT_MAC) # sdx wrap eskil.solaris -runtime $(TCLKIT_SOLARIS) cd eskil.vfs/lib ; ln -s $(TWAPI) twapi sdx wrap eskil.exe -runtime $(TCLKIT_WIN) rm eskil.vfs/lib/twapi release: setup wrap wrapexe @cp eskil.kit eskil`date +%Y%m%d`.kit @cp eskil.kit eskil$(VERSION).kit @gzip eskil.linux @mv eskil.linux.gz eskil$(VERSION).linux.gz @gzip eskil.mac @mv eskil.mac.gz eskil$(VERSION).mac.gz # @gzip eskil.solaris # @mv eskil.solaris.gz eskil$(VERSION).solaris.gz @zip eskil$(VERSION).win.zip eskil.exe @zip eskil`date +%Y%m%d`.win.zip eskil.exe |
Changes to src/plugin.tcl.
1 2 3 | #---------------------------------------------------------------------- # Eskil, Plugin handling # | | | 1 2 3 4 5 6 7 8 9 10 11 | #---------------------------------------------------------------------- # Eskil, Plugin handling # # Copyright (c) 2008-2016, Peter Spjuth (peter.spjuth@gmail.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, |
︙ | ︙ | |||
78 79 80 81 82 83 84 | $pi eval [list set ::WhoAmI [file rootname [file tail $src]]] $pi eval [list set ::WhoAmIFull [file normalize $src]] $pi eval [list set ::Info $info] interp share {} stdout $pi # Expose needed commands if {!$allow} { | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | $pi eval [list set ::WhoAmI [file rootname [file tail $src]]] $pi eval [list set ::WhoAmIFull [file normalize $src]] $pi eval [list set ::Info $info] interp share {} stdout $pi # Expose needed commands if {!$allow} { interp expose $pi fconfigure ;# needed?? interp hide $pi close } set pinfo {file 0 dir 0} dict set pinfo "allow" $allow if {[$pi eval info proc PreProcess] ne ""} { dict set pinfo file 1 |
︙ | ︙ | |||
176 177 178 179 180 181 182 183 184 185 186 187 188 189 | # Pass ::argv to plugin $::eskil($top,plugin) eval [list set ::argv $::eskil(argv)] # Pass ::Pref to plugin $::eskil($top,plugin) eval [list array set ::Pref [array get ::Pref]] # Pass File info to plugin $::eskil($top,plugin) eval [list set ::File(left) $::eskil($top,leftFile)] $::eskil($top,plugin) eval [list set ::File(right) $::eskil($top,rightFile)] set out1 [tmpFile] set out2 [tmpFile] set chi [open $::eskil($top,leftFile) r] set cho [open $out1 w] set chi2 [open $::eskil($top,rightFile) r] set cho2 [open $out2 w] | > | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | # Pass ::argv to plugin $::eskil($top,plugin) eval [list set ::argv $::eskil(argv)] # Pass ::Pref to plugin $::eskil($top,plugin) eval [list array set ::Pref [array get ::Pref]] # Pass File info to plugin $::eskil($top,plugin) eval [list set ::File(left) $::eskil($top,leftFile)] $::eskil($top,plugin) eval [list set ::File(right) $::eskil($top,rightFile)] set out1 [tmpFile] set out2 [tmpFile] set chi [open $::eskil($top,leftFile) r] set cho [open $out1 w] set chi2 [open $::eskil($top,rightFile) r] set cho2 [open $out2 w] |
︙ | ︙ | |||
236 237 238 239 240 241 242 | if {$usenew1} { # The file after processing should be used both # for comparison and for displaying. set ::eskil($top,leftFileBak) $::eskil($top,leftFile) set ::eskil($top,leftFile) $out1 } else { set ::eskil($top,leftFileDiff) $out1 | < < | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | if {$usenew1} { # The file after processing should be used both # for comparison and for displaying. set ::eskil($top,leftFileBak) $::eskil($top,leftFile) set ::eskil($top,leftFile) $out1 } else { set ::eskil($top,leftFileDiff) $out1 } if {$usenew2} { set ::eskil($top,rightFileBak) $::eskil($top,rightFile) set ::eskil($top,rightFile) $out2 } else { set ::eskil($top,rightFileDiff) $out2 } } proc cleanupPlugin {top} { if {[info exists ::eskil($top,leftFileBak)]} { set ::eskil($top,leftFile) $::eskil($top,leftFileBak) } |
︙ | ︙ | |||
299 300 301 302 303 304 305 | ttk::label $wt.l$t -text $descr -anchor w grid $wt.rb$t $wt.l$t -sticky we -padx 3 -pady 3 incr t } ttk::radiobutton $wt.rb$t -variable ::eskil($top,edit,pluginname) \ -value "" -text "No Plugin" grid $wt.rb$t -sticky we -padx 3 -pady 3 | < | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | ttk::label $wt.l$t -text $descr -anchor w grid $wt.rb$t $wt.l$t -sticky we -padx 3 -pady 3 incr t } ttk::radiobutton $wt.rb$t -variable ::eskil($top,edit,pluginname) \ -value "" -text "No Plugin" grid $wt.rb$t -sticky we -padx 3 -pady 3 ttk::label $wt.li -text "Info" -anchor w addBalloon $wt.li "Info passed to plugin. Plugin specific." ttk::entry $wt.ei -textvariable ::eskil($top,edit,plugininfo) grid $wt.li $wt.ei -sticky we -padx 3 -pady 3 ttk::checkbutton $wt.cb -text "Privilege" \ |
︙ | ︙ | |||
360 361 362 363 364 365 366 367 368 369 370 371 372 373 | $t insert end $post\n comment } else { $t insert end $line\n } } } proc ShowPlugin {parent plugin} { set src [LocatePlugin $plugin] if {$src eq ""} return set ch [open $src] set data [read $ch] close $ch set wt $parent.plugin | > | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | $t insert end $post\n comment } else { $t insert end $line\n } } } # Show plugin source proc ShowPlugin {parent plugin} { set src [LocatePlugin $plugin] if {$src eq ""} return set ch [open $src] set data [read $ch] close $ch set wt $parent.plugin |
︙ | ︙ | |||
383 384 385 386 387 388 389 | set t [Scroll both text $wt.t -width 80 -height 30 -font myfont -wrap none] pack $wt.t -fill both -expand 1 bind $t <Control-a> "[list $t tag add sel 1.0 end];break" TextViewTcl $t $data } | < | 382 383 384 385 386 387 388 | set t [Scroll both text $wt.t -width 80 -height 30 -font myfont -wrap none] pack $wt.t -fill both -expand 1 bind $t <Control-a> "[list $t tag add sel 1.0 end];break" TextViewTcl $t $data } |