Changeset d775e5 in git


Ignore:
Timestamp:
Jun 13, 2013, 5:23:32 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
e681f379bf042bd7052640aadef90dd176998b63
Parents:
e7cb20744d26d5cc5f5669542c1ef76088ea5c9f05cefcd1a3fc75f18390961692cf2f129bd68c11
Message:
Merge pull request #335 from mschulze/spielwiese

variable folders in desktop files (using @datadir@ etc.)
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    re7cb20 rd775e5  
    1111TESTDIRS=$(PACKAGES)
    1212
    13  
    1413emacsdir=$(datadir)/singular/emacs
    1514
     
    4746        redhat/singular.spec
    4847
    49 DESKTOP = desktop/Singular.png
     48iconsdir = $(datadir)/icons
     49icons_DATA = desktop/Singular.png
    5050
    51 EXTRA_DIST = autogen.sh $(EMACS) $(DEBIAN) $(REDHAT) $(DESKTOP)
     51desktopdir = $(datadir)/applications
     52desktop_DATA = desktop/Singular.desktop desktop/Singular-manual.desktop
     53
     54substvars = sed \
     55        -e 's|@docdir[@]|$(docdir)|g' \
     56        -e 's|@datadir[@]|$(datadir)|g' \
     57        -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g'
     58desktop/Singular.desktop: desktop/Singular.desktop.in
     59        $(AM_V_GEN) $(substvars) $< > $@
     60desktop/Singular-manual.desktop: desktop/Singular-manual.desktop.in
     61        $(AM_V_GEN) $(substvars) $< > $@
     62desktop_in = desktop/Singular.desktop.in desktop/Singular-manual.desktop.in
     63
     64EXTRA_DIST = autogen.sh $(EMACS) \
     65        $(DEBIAN) $(REDHAT) \
     66        $(icons_DATA) $(desktop_in)
    5267
    5368bin_SCRIPTS = libsingular-config
  • Singular/iparith.cc

    r05cefc rd775e5  
    128128#define NO_ZERODIVISOR   8
    129129#define ALLOW_ZERODIVISOR  0
     130
     131// bit 4 for warning, if used at toplevel
     132#define WARN_RING        16
    130133
    131134static BOOLEAN check_valid(const int p, const int op);
     
    88828885    }
    88838886    /* else ALLOW_ZERODIVISOR */
     8887    else if(((p & WARN_RING)==WARN_RING)&&(myynest==0))
     8888    {
     8889      WarnS("considering the image in Q[...]");
     8890    }
    88848891  }
    88858892  #endif
  • Singular/iplib.cc

    r05cefc rd775e5  
    730730}
    731731
    732 int huhu_mod_init(SModulFunctions*){ return 0; }
     732void staticdemo_mod_init(SModulFunctions*){ PrintS("init of staticdemo\n"); }
    733733
    734734#define SI_GET_BUILTIN_MOD_INIT(name) \
  • Singular/table.h

    r05cefc rd775e5  
    4747,{D(jjCHAR),       CHARACTERISTIC_CMD, INT_CMD,     RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
    4848,{D(jjCHAR),       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
     49#ifdef HAVE_FACTORY
    4950,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
     51#else
     52,{  jjWRONG ,      CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
     53#endif
    5054,{D(jjrCharStr),   CHARSTR_CMD,     XS(STRING_CMD), RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
    5155,{D(jjrCharStr),   CHARSTR_CMD,     XS(STRING_CMD), QRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
     
    147151,{D(jjJACOB_M),    JACOB_CMD,       MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}
    148152,{D(jjJanetBasis), JANET_CMD,       IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |NO_RING}
    149 ,{D(jjKBASE),      KBASE_CMD,       IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |NO_RING}
    150 ,{D(jjKBASE),      KBASE_CMD,       MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |NO_RING}
     153,{D(jjKBASE),      KBASE_CMD,       IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING|WARN_RING} /*ring-cf: warning at top level*/
     154,{D(jjKBASE),      KBASE_CMD,       MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING|WARN_RING} /*ring-cf: warning at top level*/
    151155,{D(jjLU_DECOMP),  LU_CMD,          LIST_CMD,       MATRIX_CMD    , NO_PLURAL |NO_RING}
    152156,{D(jjPFAC1),      PFAC_CMD,        LIST_CMD,       BIGINT_CMD    , ALLOW_PLURAL |ALLOW_RING}
     
    201205,{D(jjNVARS),      NVARS_CMD,       INT_CMD,        QRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
    202206,{D(jjOpenClose),  OPEN_CMD,        NONE,           LINK_CMD      , ALLOW_PLURAL |ALLOW_RING}
     207,{D(jjCALL1MANY),  OPTION_CMD,      NONE,           DEF_CMD       , ALLOW_PLURAL |ALLOW_RING} /*libsing*/
    203208,{D(jjORD),        ORD_CMD,         INT_CMD,        POLY_CMD      , ALLOW_PLURAL |ALLOW_RING}
    204209,{D(jjORD),        ORD_CMD,         INT_CMD,        VECTOR_CMD    , ALLOW_PLURAL |ALLOW_RING}
     
    277282,{D(jjVARIABLES_ID),VARIABLES_CMD,  IDEAL_CMD,      MATRIX_CMD    , ALLOW_PLURAL |ALLOW_RING}
    278283,{D(jjDUMMY),      VECTOR_CMD,      VECTOR_CMD,     VECTOR_CMD    , ALLOW_PLURAL |ALLOW_RING}
    279 ,{D(jjVDIM),       VDIM_CMD,        INT_CMD,        IDEAL_CMD     , ALLOW_PLURAL |NO_RING}
    280 ,{D(jjVDIM),       VDIM_CMD,        INT_CMD,        MODUL_CMD     , ALLOW_PLURAL |NO_RING}
     284,{D(jjVDIM),       VDIM_CMD,        INT_CMD,        IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/
     285,{D(jjVDIM),       VDIM_CMD,        INT_CMD,        MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/
    281286,{D(jjVAR1),       VAR_CMD,         POLY_CMD,       INT_CMD       , ALLOW_PLURAL |ALLOW_RING}
    282287,{D(jjVARSTR1),    VARSTR_CMD,      STRING_CMD,     INT_CMD       , ALLOW_PLURAL |ALLOW_RING}
     
    585590,{D(jjJET_ID),    JET_CMD,        MODUL_CMD,      MODUL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    586591,{D(jjJET_ID),    JET_CMD,        MATRIX_CMD,     MATRIX_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    587 ,{D(jjKBASE2),    KBASE_CMD,      IDEAL_CMD,      IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |NO_RING}
    588 ,{D(jjKBASE2),    KBASE_CMD,      MODUL_CMD,      MODUL_CMD,  INT_CMD, ALLOW_PLURAL |NO_RING}
     592,{D(jjKBASE2),    KBASE_CMD,      IDEAL_CMD,      IDEAL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/
     593,{D(jjKBASE2),    KBASE_CMD,      MODUL_CMD,      MODUL_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING |WARN_RING} /*ring-cf: warning at top level*/
    589594,{D(jjKERNEL),    KERNEL_CMD,     IDEAL_CMD, RING_CMD,        ANY_TYPE, ALLOW_PLURAL |ALLOW_RING}
    590595,{D(jjKERNEL),    KERNEL_CMD,     IDEAL_CMD, QRING_CMD,       ANY_TYPE, ALLOW_PLURAL |ALLOW_RING}
     
    832837,{D(loSimplex),   SIMPLEX_CMD,     LIST_CMD,            6      , NO_PLURAL |NO_RING}
    833838,{D(nuUResSolve), URSOLVE_CMD,     LIST_CMD,            4      , NO_PLURAL |NO_RING}
    834 ,{D(jjCALL1ARG),  SBA_CMD,         IDEAL_CMD,           1      , ALLOW_PLURAL |ALLOW_RING}
    835 ,{D(jjCALL2ARG),  SBA_CMD,         IDEAL_CMD,           2      , ALLOW_PLURAL |ALLOW_RING}
    836 ,{D(jjCALL3ARG),  SBA_CMD,         IDEAL_CMD,           3      , NO_PLURAL |ALLOW_RING}
    837839,{D(jjCALL1ARG),  STD_CMD,         IDEAL_CMD,           1      , ALLOW_PLURAL |ALLOW_RING}
    838840,{D(jjCALL2ARG),  STD_CMD,         IDEAL_CMD,           2      , ALLOW_PLURAL |ALLOW_RING}
     
    10351037  { "ringlist",    0, RINGLIST_CMD ,      CMD_1},
    10361038  { "rvar",        0, IS_RINGVAR ,        CMD_1},
    1037   { "sba",         0, SBA_CMD ,           CMD_M},
     1039  { "sba",         0, SBA_CMD ,           CMD_123},
    10381040  { "setring",     0, SETRING_CMD ,       SETRING_CMD},
    10391041  { "simplex",     0, SIMPLEX_CMD,        CMD_M},
     
    11411143//  intvec -> matrix
    11421144   { INTVEC_CMD,      MATRIX_CMD,     D(iiIm2Ma) , NULL },
    1143 //  intmat -> matrix
    1144    { INTMAT_CMD,      MATRIX_CMD,     D(iiIm2Ma) , NULL },
    11451145//  intmat -> bigintmat
    11461146   { INTMAT_CMD,      BIGINTMAT_CMD,  D(iiIm2Bim) , NULL },
    11471147//  bigintmat -> intmat
    11481148   { BIGINTMAT_CMD,   INTMAT_CMD,     D(iiBim2Im) , NULL },
     1149//  intmat -> matrix
     1150   { INTMAT_CMD,      MATRIX_CMD,     D(iiIm2Ma) , NULL },
    11491151//  number -> poly
    11501152   { NUMBER_CMD,      POLY_CMD,       D(iiN2P)  , NULL },
  • configure.ac

    re7cb20 rd775e5  
    171171AC_CONFIG_FILES([IntegerProgramming/Makefile])
    172172AC_CONFIG_FILES([libsingular-config])
     173
    173174AC_CONFIG_SUBDIRS([gfanlib])
    174175
    175176AC_CONFIG_FILES([redhat/singular.spec])
    176 AC_CONFIG_FILES([desktop/Singular.desktop])
    177 AC_CONFIG_FILES([desktop/Singular-manual.desktop])
    178177
    179178AC_OUTPUT
  • desktop/Singular-manual.desktop.in

    re7cb20 rd775e5  
    99Comment[ru]=
    1010Type=Link
    11 URL=file:///usr/share/doc/Singular/html/index.htm
    12 Icon=/usr/share/icons/Singular.png
     11URL=file://@docdir@/html/index.htm
     12Icon=@datadir@/icons/Singular.png
    1313Categories=Math;Science;Development;Education;Documentation;
    1414Encoding=UTF-8
  • desktop/Singular.desktop.in

    re7cb20 rd775e5  
    1111Terminal=true
    1212Categories=Math;Science;Education;
    13 Icon=/usr/share/icons/Singular.png
     13Icon=@datadir@/icons/Singular.png
    1414Encoding=UTF-8
    1515
  • libpolys/polys/mod_raw.h

    r05cefc rd775e5  
    5353/// use @c add(name) to add built-in library to macro
    5454#define SI_FOREACH_BUILTIN(add)\
    55   add(huhu)\
     55  add(staticdemo)\
    5656  SI_BUILTIN_PYOBJECT(add)
    5757
     58#define SI_MOD_INIT(name) name##_mod_init
    5859
    5960#endif /* MOD_RAW_H */
Note: See TracChangeset for help on using the changeset viewer.