Changeset 35d0c19 in git


Ignore:
Timestamp:
Oct 2, 2014, 10:40:16 AM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
d2c687e51cd1c5a8331e347267ee0939a40ed433
Parents:
f4c840ef54e2d488440c753600a24efad35e9652
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-10-02 10:40:16+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-10-02 10:42:02+02:00
Message:
windows port: removed htmlhelp, sing_win.*
Files:
4 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • COPYING

    rf4c840 r35d0c19  
    1414
    1515Some single files have a copyright given within the file:
    16 Singular/links/ndbm.* (BSD), Singular/htmlhelp.h (LGPL 2.1+)
     16Singular/links/ndbm.* (BSD)
    1717
    1818The following software modules shipped with SINGULAR have their own
  • Singular/COPYING

    rf4c840 r35d0c19  
    1818
    1919Some single files have a copyright given within the file:
    20 Singular/ndbm.* (BSD), Singular/htmlhelp.h (LGPL 2.1+)
     20Singular/ndbm.* (BSD).
    2121
    2222This program is distributed in the hope that it will be useful, but
  • Singular/LIB/help.cnf

    rf4c840 r35d0c19  
    2525# the default help browsers builtin, dummy and emacs are always
    2626#   available and should NOT be mentioned here
    27 # __CYGWIN__: has additional default browsers: htmlhelp, html and winhlp
    28 #   also not mentioned here
    2927#----------------------------------------------------
    3028htmlview!xDhE:htmlview:!htmlview %h &
  • Singular/Makefile.am

    rf4c840 r35d0c19  
    5555   links/silink.cc\
    5656   links/sing_dbm.cc\
    57    sing_win.cc\
    5857   links/slInit_Static.cc\
    5958   links/ssiLink.cc\
     
    8382   gms.h \
    8483   grammar.h \
    85    htmlhelp.h \
    8684   idrec.h \
    8785   ipconv.h \
     
    109107   links/silink.h \
    110108   links/sing_dbm.h \
    111    sing_win.h \
    112109   links/slInit.h \
    113110   links/ssiLink.h \
  • Singular/cntrlc.h

    rf4c840 r35d0c19  
    88*/
    99#include <setjmp.h>
     10#include <misc/auxiliary.h>
    1011#include <kernel/structs.h>
    1112
  • Singular/emacs.cc

    rf4c840 r35d0c19  
    99
    1010
     11#ifdef __CYGWIN__
     12#define BOOLEAN boolean
     13#endif
    1114#include <kernel/mod2.h>
    1215
     
    3942#endif
    4043
    41 #ifndef BOOLEAN
    42 #define BOOLEAN int
    43 #endif
    4444#ifndef FALSE
    4545#define FALSE 0
  • Singular/fehelp.cc

    rf4c840 r35d0c19  
    8383static BOOLEAN heEmacsInit(int,int);   static void heEmacsHelp(heEntry hentry,int);
    8484
    85 #ifdef __CYGWIN__
    86 static void heHtmlHelp(heEntry hentry,int);
    87 static void heWinHelp(heEntry hentry,int);
    88 static void heWinHtmlHelp(heEntry hentry,int);
    89 #include "sing_win.h"
    90 #endif
    91 
    9285static heBrowser heCurrentHelpBrowser = NULL;
    9386static int heCurrentHelpBrowserIndex= -1;
     
    137130    if (heCurrentHelpBrowser == NULL) feHelpBrowser(NULL, 0);
    138131    assume(heCurrentHelpBrowser != NULL);
    139 #ifdef __CYGWIN__
    140     if (strcmp(heCurrentHelpBrowser->browser,"htmlhelp")==0)
    141     {
    142       // In Windows always let htmlhelp handle request, if standard
    143       strcpy(hentry.key, str);
    144       *hentry.node = '\0';
    145       *hentry.url = '\0';
    146       hentry.chksum = 0;
    147       heBrowserHelp(&hentry);
    148     }
    149 #endif
    150132
    151133    StringSetS("");
     
    216198    }
    217199    fseek(f,0,SEEK_SET);
    218 #ifdef __CYGWIN__
    219     // for the 7(!) default browsers and make htmlhelp the default default
    220     heHelpBrowsers=(heBrowser_s*)omAlloc0((br+7)*sizeof(heBrowser_s));
    221     br = 0;
    222     heHelpBrowsers[br].browser="htmlhelp";
    223     heHelpBrowsers[br].init_proc=heGenInit;
    224     heHelpBrowsers[br].help_proc=heWinHtmlHelp;
    225     heHelpBrowsers[br].required="C";
    226     // heHelpBrowsers[br].action=NULL;
    227     br++;
    228 #else
    229200    // for the 4(!) default browsers
    230201    heHelpBrowsers=(heBrowser_s*)omAlloc0((br+4)*sizeof(heBrowser_s));
    231202    br = 0;
    232 #endif
    233203    while (fgets( buf, sizeof(buf), f))
    234204    {
     
    260230  else
    261231  {
    262 #ifdef __CYGWIN__
    263     // for the 7(!) default browsers
    264     heHelpBrowsers=(heBrowser_s*)omAlloc0(7*sizeof(heBrowser_s));
    265     heHelpBrowsers[br].browser="htmlhelp";
    266     heHelpBrowsers[br].init_proc=heGenInit;
    267     heHelpBrowsers[br].help_proc=heWinHtmlHelp;
    268     heHelpBrowsers[br].required="C";
    269     // heHelpBrowsers[br].action=NULL;
    270     br++;
    271 #else
    272232    // for the 4(!) default browsers
    273233    heHelpBrowsers=(heBrowser_s*)omAlloc0(4*sizeof(heBrowser_s));
    274 #endif
    275   }
    276 #ifdef __CYGWIN__
    277   heHelpBrowsers[br].browser="winhlp";
    278   heHelpBrowsers[br].init_proc=heGenInit;
    279   heHelpBrowsers[br].help_proc=heWinHelp;
    280   heHelpBrowsers[br].required="h";
    281   //heHelpBrowsers[br].action=NULL;
    282   br++;
    283   heHelpBrowsers[br].browser="html";
    284   heHelpBrowsers[br].init_proc=heGenInit;
    285   heHelpBrowsers[br].help_proc=heHtmlHelp;
    286   heHelpBrowsers[br].required="h";
    287   //heHelpBrowsers[br].action=NULL;
    288   br++;
    289 #endif
     234  }
    290235  heHelpBrowsers[br].browser="builtin";
    291236  heHelpBrowsers[br].init_proc=heGenInit;
     
    326271
    327272    // First, try emacs, if emacs-option is set
    328     // Under Win, always use html
    329 #ifndef __CYGWIN__
    330273    if (feOptValue(FE_OPT_EMACS) != NULL)
    331274    {
     
    343286      i=0;
    344287    }
    345 #endif
    346288    while (heHelpBrowsers[i].browser != NULL)
    347289    {
     
    935877}
    936878
    937 #ifdef __CYGWIN__
    938 
    939 static void heHtmlHelp(heEntry hentry, int br)
    940 {
    941   char url[MAXPATHLEN];
    942   char* html_dir = feResource('h' /*"HtmlDir"*/);
    943   sprintf(url, "%s/%s",
    944           (html_dir != NULL ? html_dir : feResource('u' /*"ManualUrl"*/)),
    945           (hentry!=NULL && *(hentry->url)!='\0' ? hentry->url : "index.htm"));
    946 
    947   heOpenWinntUrl(url, (html_dir != NULL ? 1 : 0));
    948 }
    949 
    950 static void heWinHtmlHelp(heEntry hentry, int br)
    951 // Function to call the Microsoft HTML Help System
    952 // Uses API Call Function in sing_win.cc
    953 {
    954   char keyw[MAX_HE_ENTRY_LENGTH];
    955   if ((hentry!=NULL)&&(hentry->key!=NULL))
    956     strcpy(keyw,hentry->key);
    957   else
    958     strcpy(keyw," ");
    959   char* helppath = feResource('C' /*"CHM Datei"*/);
    960   heOpenWinHtmlHelp(keyw,helppath);
    961 }
    962 
    963 static void heWinHelp(heEntry hentry, int br)
    964 {
    965   char keyw[MAX_HE_ENTRY_LENGTH];
    966   if ((hentry!=NULL)&&(hentry->key!=NULL))
    967     strcpy(keyw,hentry->key);
    968   else
    969     strcpy(keyw," ");
    970   char* helppath = feResource('h' /*"HtmlDir"*/);
    971   const char *filename="/Manual.hlp";
    972   int helppath_len=0;
    973   if (helppath!=NULL) helppath_len=strlen(helppath);
    974   char *callpath=(char *)omAlloc0(helppath_len+strlen(filename)+1);
    975   if ((helppath!=NULL) && (*helppath>' '))
    976     strcpy(callpath,helppath);
    977   strcat(callpath,filename);
    978   heOpenWinntHlp(keyw,callpath);
    979   omfree(callpath);
    980 }
    981 #endif
    982879static void heGenHelp(heEntry hentry, int br)
    983880{
     
    1094991}
    1095992
    1096 #ifdef __CYGWIN__
    1097 static void heHtmlHelp(heEntry hentry)
    1098 {
    1099   char url[MAXPATHLEN];
    1100   char* html_dir = feResource('h' /*"HtmlDir"*/);
    1101   sprintf(url, "%s/%s",
    1102           (html_dir != NULL ? html_dir : feResource('u' /*"ManualUrl"*/)),
    1103           (hentry!=NULL && *(hentry->url)!='\0' ? hentry->url : "index.htm"));
    1104 
    1105   heOpenWinntUrl(url, (html_dir != NULL ? 1 : 0));
    1106 }
    1107 
    1108 static void heWinHelp(heEntry hentry)
    1109 {
    1110   char keyw[MAX_HE_ENTRY_LENGTH];
    1111   if ((hentry!=NULL)&&(hentry->key!=NULL))
    1112     strcpy(keyw,hentry->key);
    1113   else
    1114     strcpy(keyw," ");
    1115   char* helppath = feResource('h' /*"HtmlDir"*/);
    1116   const char *filename="/Manual.hlp";
    1117   int helppath_len=0;
    1118   if (helppath!=NULL) helppath_len=strlen(helppath);
    1119   char *callpath=(char *)omAlloc0(helppath_len+strlen(filename)+1);
    1120   if ((helppath!=NULL) && (*helppath>' '))
    1121     strcpy(callpath,helppath);
    1122   strcat(callpath,filename);
    1123   heOpenWinntHlp(keyw,callpath);
    1124   omfree(callpath);
    1125 }
    1126 #endif
    1127 
    1128993static BOOLEAN heDummyInit(int /*warn*/, int /*br*/)
    1129994{
  • Singular/test.cc

    rf4c840 r35d0c19  
    118118#include <kernel/spectrum/GMPrat.h>
    119119
    120 // #include "htmlhelp.h" // For Windows //
    121120#include <kernel/combinatorics/hutil.h>
    122121// #include <kernel/Ideal.h> // Too old?
     
    202201#include <Singular/links/silink.h>
    203202#include <Singular/links/sing_dbm.h>
    204 #include <Singular/sing_win.h>
    205203#include <Singular/links/slInit.h>
    206204#include <Singular/links/ssiLink.h>
  • doc/COPYING.texi

    rf4c840 r35d0c19  
    3434
    3535Some single files have a copyright given within the file:
    36 Singular/ndbm.* (BSD), Singular/htmlhelp.h (LGPL 2.1+)
     36Singular/ndbm.* (BSD)
    3737
    3838The following software modules shipped with @sc{Singular} have their own copyright:
  • kernel/mod2.h

    rf4c840 r35d0c19  
    1313# include <singularconfig.h>
    1414
    15 # include <misc/auxiliary.h>
     15//# include <misc/auxiliary.h>
    1616
    1717#define SINGULAR_MAJOR_VERSION 4
  • libpolys/COPYING

    rf4c840 r35d0c19  
    1818
    1919Some single files have a copyright given within the file:
    20 Singular/ndbm.* (BSD), Singular/htmlhelp.h (LGPL 2.1+)
     20Singular/ndbm.* (BSD)
    2121
    2222The following software used with SINGULAR have their own copyright: the
  • resources/feResource.cc

    rf4c840 r35d0c19  
    8787  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/doc/singular.idx",  (char *)""},
    8888  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
    89 #ifdef __CYGWIN__
    90   {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
    91 #endif
    9289  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/",    (char *)""},
    9390  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
  • resources/feResource.h

    rf4c840 r35d0c19  
    5555extern char* feArgv0;
    5656
    57 const char fePathSep =
    58 /* not really cygwin, applies to all windows systems:*/
    59 #if (defined(__CYGWIN__))
    60                 ';'
    61 #else
    62                 ':'
    63 #endif
    64                 ;
    65 
    66 
     57const char fePathSep = ':' ;
    6758
    6859#endif
Note: See TracChangeset for help on using the changeset viewer.