Changeset 548


Ignore:
Timestamp:
02/13/09 22:25:37 (3 years ago)
Author:
mooneer
Message:

Added System.compile_options to assist in module building.

Location:
interpreter/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • interpreter/trunk/ChangeLog

    r545 r548  
     12/13/2009: 
     2    * Added System.compile_options to assist in module building. 
     3     
    142/8/2009: 
    25    * Added support for single quotes for strings (ticket #85). 

  • interpreter/trunk/Doxyfile

    r503 r548  
    3232# if some version control system is used. 
    3333 
    34 PROJECT_NUMBER         = 1.0.0 
     34PROJECT_NUMBER         = 1.0.2 
    3535 
    3636# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)  

  • interpreter/trunk/Makefile.am

    r543 r548  
    6464EXTRA_DIST = cinvoke/arch/empty_empty_empty.c cinvoke/arch/empty_empty_empty.h 
    6565 
    66 EXTRA_DIST += modules/build_kdocs.in 
     66EXTRA_DIST += modules/build_kdocs.in Doxyfile 
    6767#BUILT_SOURCES = modules/build_kdocs 
    6868bin_SCRIPTS = modules/build_kdocs 

  • interpreter/trunk/configure.ac

    r532 r548  
    33 
    44AC_PREREQ(2.61) 
    5 AC_INIT(kite, 1.0.1, bugs@kite-language.org) 
     5AC_INIT(kite, 1.0.2, bugs@kite-language.org) 
    66AC_CONFIG_SRCDIR([apps/kite.c]) 
    77AC_CONFIG_HEADER([config.h]) 
    … …  
    1010AC_DEFINE(VERSION_MAJOR, [1], [The major version number.]) 
    1111AC_DEFINE(VERSION_MINOR, [0], [The minor version number.]) 
    12 AC_DEFINE(VERSION_PATCH, [1], [The patch level.]) 
     12AC_DEFINE(VERSION_PATCH, [2], [The patch level.]) 
    1313 
    1414# Checks for programs. 
    … …  
    5757   gc_save_CPPFLAGS="$CPPFLAGS" 
    5858   gc_save_LDFLAGS="$LDFLAGS" 
    59    CFLAGS="$CFLAGS -I$with_gc/include" 
    60    CPPFLAGS="$CPPFLAGS -I$with_gc/include" 
     59   CFLAGS="$CFLAGS -I$with_gc/include -DHAVE_GC_GC_H" 
     60   CXXFLAGS="$CXXFLAGS -I$with_gc/include -DHAVE_GC_GC_H" 
    6161   LDFLAGS="$LDFLAGS -L$with_gc/lib" 
    6262 fi 
    … …  
    8484     fi 
    8585    ]) 
     86     
     87 AC_SUBST([HAVE_GC], [true]) 
     88], [ 
     89    AC_SUBST([HAVE_GC], [false]) 
    8690]) 
    8791 
    … …  
    145149        AC_DEFINE(ARCH_GCC_X86_WIN, [1], [x86 Windows]) 
    146150        AC_DEFINE(BUILD_CINVOKE, [1], [Build C/Invoke library]) 
     151        AM_CONDITIONAL([DYLIB_EXT_WINDOWS], [true]) 
     152        AM_CONDITIONAL([DYLIB_EXT_OSX], [false]) 
     153        AM_CONDITIONAL([DYLIB_EXT_UNIX], [false]) 
    147154        ;; 
    148155    i[[3456789]]86-*-*) 
    … …  
    152159        AC_DEFINE(ARCH_GCC_X86_UNIX, [1], [x86 Unix]) 
    153160        AC_DEFINE(BUILD_CINVOKE, [1], [Build C/Invoke library]) 
     161        case "${host}" in 
     162            *-apple-*) 
     163                AM_CONDITIONAL([DYLIB_EXT_OSX], [true]) 
     164                AM_CONDITIONAL([DYLIB_EXT_UNIX], [false]) 
     165                ;; 
     166            *) 
     167                AM_CONDITIONAL([DYLIB_EXT_UNIX], [true]) 
     168                AM_CONDITIONAL([DYLIB_EXT_OSX], [false]) 
     169                ;; 
     170        esac 
     171        AM_CONDITIONAL([DYLIB_EXT_WINDOWS], [false]) 
    154172        ;; 
    155173    x86_64-*-*) 
    … …  
    159177        AC_DEFINE(ARCH_GCC_X64_UNIX, [1], [x64 Unix]) 
    160178        AC_DEFINE(BUILD_CINVOKE, [1], [Build C/Invoke library]) 
     179        case "${host}" in 
     180            *-apple-*) 
     181                AM_CONDITIONAL([DYLIB_EXT_OSX], [true]) 
     182                AM_CONDITIONAL([DYLIB_EXT_UNIX], [false]) 
     183                ;; 
     184            *) 
     185                AM_CONDITIONAL([DYLIB_EXT_UNIX], [true]) 
     186                AM_CONDITIONAL([DYLIB_EXT_OSX], [false]) 
     187                ;; 
     188        esac 
     189        AM_CONDITIONAL([DYLIB_EXT_WINDOWS], [false]) 
    161190        ;; 
    162191    sparc-*-*) 
    … …  
    166195        AC_DEFINE(ARCH_GCC_SPARC_UNIX, [1], [Sparc Unix]) 
    167196        AC_DEFINE(BUILD_CINVOKE, [1], [Build C/Invoke library]) 
     197        AM_CONDITIONAL([DYLIB_EXT_UNIX], [true]) 
     198        AM_CONDITIONAL([DYLIB_EXT_OSX], [false]) 
     199        AM_CONDITIONAL([DYLIB_EXT_WINDOWS], [false]) 
    168200        ;; 
    169201    powerpc-*-darwin*) 
    … …  
    173205        AC_DEFINE(BUILD_CINVOKE, [1], [Build C/Invoke library]) 
    174206        AC_DEFINE(ARCH_GCC_PPC_OSX, [1], [PPC OSX]) 
     207        AM_CONDITIONAL([DYLIB_EXT_OSX], [true]]) 
     208        AM_CONDITIONAL([DYLIB_EXT_UNIX], [false]) 
     209        AM_CONDITIONAL([DYLIB_EXT_WINDOWS], [false]) 
    175210        ;; 
    176211    *) 
    177212        AC_MSG_RESULT([no support]) 
     213        AM_CONDITIONAL([DYLIB_EXT_UNIX], [true]) 
     214        AM_CONDITIONAL([DYLIB_EXT_OSX], [false]) 
     215        AM_CONDITIONAL([DYLIB_EXT_WINDOWS], [false]) 
    178216        ;; 
    179217esac 

  • interpreter/trunk/docs/version.texi

    r528 r548  
    1 @set UPDATED 4 February 2009 
    2 @set UPDATED-MONTH February 2009 
    3 @set EDITION 1.0.1 
    4 @set VERSION 1.0.1 
     1@set UPDATED 16 December 2008 
     2@set UPDATED-MONTH December 2008 
     3@set EDITION 1.0.2 
     4@set VERSION 1.0.2 

  • interpreter/trunk/modules/Makefile.am

    r530 r548  
    2020        interface/http.kt interface/http/cgi.kt interface/language.kt interface/language/c.kt \ 
    2121        interface/text.kt interface/text/readline.kt interface/text/base64.kt \ 
    22         interface/text/binary.kt interface/pop3.kt interface/smtp.kt all_modules.kt 
     22        interface/text/binary.kt interface/pop3.kt interface/smtp.kt all_modules.kt \ 
     23        System/compile_options.kt 
    2324 
    2425AM_CFLAGS = -Wdeclaration-after-statement -Wextra -fno-omit-frame-pointer -ISystem/digest/ -I../objs -I../vm -fPIC -W -Wall -DCINVOKE_BUILD 
    2526AM_LDFLAGS = -fPIC 
     27 
     28BUILT_SOURCES = System/compile_options.kt 
     29 
     30if DYLIB_EXT_UNIX 
     31LD_DYLIB_FLAGS = -shared 
     32LD_DYLIB_EXTENSION = .so 
     33else 
     34if DYLIB_EXT_OSX 
     35LD_DYLIB_FLAGS = -dynamiclib -Wl,-undefined,dynamic_lookup 
     36LD_DYLIB_EXTENSION = .dylib 
     37else 
     38LD_DYLIB_FLAGS = -shared 
     39LD_DYLIB_EXTENSION = .dll 
     40endif 
     41endif 
     42 
     43install-exec-hook: 
     44        mkdir -p $(pkglibdir)/local-pkgs 
     45 
     46System/compile_options.kt: Makefile 
     47        echo "global property build_cflags;" > System/compile_options.kt 
     48        echo "global property build_cxxflags;" >> System/compile_options.kt 
     49        echo "global property build_ldflags;" >> System/compile_options.kt 
     50        echo "global property build_cc;" >> System/compile_options.kt 
     51        echo "global property build_cplusplus;" >> System/compile_options.kt 
     52        echo "global property build_dylib_extension;" >> System/compile_options.kt 
     53        echo "global property build_dylib_flags;" >> System/compile_options.kt 
     54        echo "global property build_with_gc;" >> System/compile_options.kt 
     55        echo "global property build_install_dir;" >> System/compile_options.kt 
     56        echo "build_cflags = \"$(CFLAGS) $(AM_CFLAGS)\";" >> System/compile_options.kt 
     57        echo "build_cxxflags = \"$(CXXFLAGS) $(AM_CXXFLAGS)\";" >> System/compile_options.kt 
     58        echo "build_ldflags = \"$(LDFLAGS) $(AM_LDFLAGS)\";" >> System/compile_options.kt 
     59        echo "build_cc = \"$(CC)\";" >> System/compile_options.kt 
     60        echo "build_cplusplus = \"$(CXX)\";" >> System/compile_options.kt 
     61        echo "build_dylib_extension = \"$(LD_DYLIB_EXTENSION)\";" >> System/compile_options.kt 
     62        echo "build_dylib_flags = \"$(LD_DYLIB_FLAGS)\";" >> System/compile_options.kt 
     63        echo "build_with_gc = $(HAVE_GC);" >> System/compile_options.kt 
     64        echo "build_install_dir = \"$(pkglibdir)/local-pkgs\";" >> System/compile_options.kt 

  • interpreter/trunk/modules/all_modules.kt

    r538 r548  
    5757import "System.vm.thread"; 
    5858import "System.vm"; 
     59import "System.compile_options"; 
    5960 
    6061import "interface.http.cgi"; 

  • interpreter/trunk/windows/config.h

    r527 r548  
    114114 
    115115/* Define to the full name and version of this package. */ 
    116 #define PACKAGE_STRING "kite 1.0.1" 
     116#define PACKAGE_STRING "kite 1.0.2" 
    117117 
    118118/* Define to the one symbol short name of this package. */ 
    … …  
    120120 
    121121/* Define to the version of this package. */ 
    122 #define PACKAGE_VERSION "1.0.1" 
     122#define PACKAGE_VERSION "1.0.2" 
    123123 
    124124/* Define to 1 if you have the ANSI C header files. */ 
    … …  
    129129 
    130130/* Version number of package */ 
    131 #define VERSION "1.0.1" 
     131#define VERSION "1.0.2" 
    132132 
    133133/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a 
    … …  
    152152 
    153153/* The patch level. */ 
    154 #define VERSION_PATCH 1 
     154#define VERSION_PATCH 2 
    155155 
    156156#define LIBRARY_SEARCH_PATH "" 

  • interpreter/trunk/windows/kite_parser.c

    r534 r548  
    315315    kite_opcode_t *opValue; 
    316316} 
    317 /* Line 187 of yacc.c.  */ 
     317/* Line 193 of yacc.c.  */ 
    318318#line 319 "kite_parser.c" 
    319319        YYSTYPE; 
    … …  
    391391 
    392392#ifndef YY_ 
    393 # if YYENABLE_NLS 
     393# if defined YYENABLE_NLS && YYENABLE_NLS 
    394394#  if ENABLE_NLS 
    395395#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */ 
    … …  
    11371137 
    11381138#ifndef YY_LOCATION_PRINT 
    1139 # if YYLTYPE_IS_TRIVIAL 
     1139# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL 
    11401140#  define YY_LOCATION_PRINT(File, Loc)                  \ 
    11411141     fprintf (File, "%d.%d-%d.%d",                      \ 
    … …  
    17141714  yyvsp = yyvs; 
    17151715  yylsp = yyls; 
    1716 #if YYLTYPE_IS_TRIVIAL 
     1716#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL 
    17171717  /* Initialize the default location before parsing starts.  */ 
    17181718  yylloc.first_line   = yylloc.last_line   = 1; 

  • interpreter/trunk/windows/kite_parser.h

    r534 r548  
    165165    kite_opcode_t *opValue; 
    166166} 
    167 /* Line 1489 of yacc.c.  */ 
     167/* Line 1529 of yacc.c.  */ 
    168168#line 169 "kite_parser.h" 
    169169        YYSTYPE; 
Note: See TracChangeset for help on using the changeset viewer.