Changeset 7579

Show
Ignore:
Timestamp:
10/12/05 17:11:11 (3 years ago)
Author:
rafl
Message:

r17088@ata: rafl | 2005-10-12 17:10:51 +0200

  • Made changes to remove all directories from include-dirs in Pugs.cabal that are in the source tree. They aren't installed or needed for linking, etc.
Files:
29 modified

Legend:

Unmodified
Added
Removed

  • Makefile.PL

    r7572 r7579  
    366366 
    367367.hsc.hs : 
    368         $hsc2hs $hsc2hs_flags \$< 
     368        \$(PERL) -MFile::Spec -e'my (undef, \$\$dir, \$\$file) = File::Spec->splitpath("\$<"); chdir("\$\$dir"); system("$hsc2hs $hsc2hs_flags \$\$file");' 
    369369 
    370370.SUFFIXES: .hs-drift .hs 

  • Pugs.cabal.in

    r7476 r7579  
    2121extra-lib-dirs: __LIB_DIRS__ 
    2222extensions: ForeignFunctionInterface 
    23 includes: syck.h pcre.h 
    24 include-dirs: . src/pcre src/cbits src/perl5 src/syck src/cbits src __INCLUDE_DIRS__ 
     23include-dirs: __INCLUDE_DIRS__ 
    2524hs-source-dir: src 
    2625other-modules: Data.Yaml.Syck DrIFT.Binary DrIFT.JSON DrIFT.Perl5 RRegex RRegex.PCRE RRegex.Syntax System.FilePath UTF8 Unicode 

  • inc/Module/Install/Pugs.pm

    r7449 r7579  
    163163. 
    164164    } 
    165     my $ghc_flags = "-H0 -L. -Lsrc -Lsrc/syck -Lsrc/pcre -I. -Isrc -Isrc/pcre -Isrc/syck "; 
     165#    my $ghc_flags = "-H0 -L. -Lsrc -Lsrc/syck -Lsrc/pcre -I. -Isrc -Isrc/pcre -Isrc/syck "; 
     166    my $ghc_flags = "-H0 -L. -Lsrc -Lsrc/syck -Lsrc/pcre "; 
    166167    $ghc_flags .= " -i. -isrc -isrc/pcre -isrc/syck -static "; 
    167168    $ghc_flags .= " -Wall " #  -package-name Pugs -odir dist/build/src -hidir dist/build/src " 
    … …  
    171172      if $self->is_extension_build; 
    172173    if ($ENV{PUGS_EMBED} and $ENV{PUGS_EMBED} =~ /perl5/i) { 
    173         $ghc_flags .= " -isrc/perl5 -Isrc/perl5 "; 
     174#        $ghc_flags .= " -isrc/perl5 -Isrc/perl5 "; 
     175        $ghc_flags .= " -isrc/perl5 "; 
    174176        $ghc_flags .= join(' ', grep { m{^/} or m{^-[DILl]} or m{^-Wl,-R} } 
    175177                        split (' ', `$^X -MExtUtils::Embed -e ccopts,ldopts`)); 

  • src/Data/Yaml/Syck.hsc

    r2808 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fvia-C #-} 
    2 #include <syck.h> 
     2#include "../../syck/syck.h" 
    33 
    44module Data.Yaml.Syck ( 

  • src/Pugs/AST.hs

    r7035 r7579  
    11{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/AST/Internals.hs

    r7544 r7579  
    11{-# OPTIONS_GHC -cpp -fglasgow-exts -fno-warn-orphans -funbox-strict-fields #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.AST.Internals ( 

  • src/Pugs/CodeGen/Binary.hs

    r6257 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.CodeGen.Binary (genBinary) where 

  • src/Pugs/CodeGen/JSON.hs

    r6257 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.CodeGen.JSON (genJSON) where 

  • src/Pugs/CodeGen/PIL.hs

    r6248 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.CodeGen.PIL (genPIL) where 

  • src/Pugs/CodeGen/PIR.hs

    r7281 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/CodeGen/Perl5.hs

    r6257 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.CodeGen.Perl5 (genPerl5) where 

  • src/Pugs/Compile.hs

    r6801 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/Embed/Perl5.hs

    r7553 r7579  
    6565#else 
    6666 
    67 {-# INCLUDE <p5embed.h> #-} 
    68 {-# INCLUDE <pugsembed.h> #-} 
     67{-# INCLUDE "../../perl5/p5embed.h" #-} 
     68{-# INCLUDE "../../perl5/pugsembed.h" #-} 
    6969 
    7070module Pugs.Embed.Perl5 where 
    … …  
    9191foreign import ccall "perl.h boot_DynaLoader" 
    9292    boot_DynaLoader :: Ptr () -> IO () 
    93 foreign import ccall "p5embed.h perl5_finalize" 
     93foreign import ccall "../../perl5/p5embed.h perl5_finalize" 
    9494    perl5_finalize :: PerlSV -> IO () 
    95 foreign import ccall "p5embed.h perl5_SvPV" 
     95foreign import ccall "../../perl5/p5embed.h perl5_SvPV" 
    9696    perl5_SvPV :: PerlSV -> IO CString 
    97 foreign import ccall "p5embed.h perl5_SvIV" 
     97foreign import ccall "../../perl5/p5embed.h perl5_SvIV" 
    9898    perl5_SvIV :: PerlSV -> IO CInt 
    99 foreign import ccall "p5embed.h perl5_SvNV" 
     99foreign import ccall "../../perl5/p5embed.h perl5_SvNV" 
    100100    perl5_SvNV :: PerlSV -> IO CDouble 
    101 foreign import ccall "p5embed.h perl5_SvTRUE" 
     101foreign import ccall "../../perl5/p5embed.h perl5_SvTRUE" 
    102102    perl5_SvTRUE :: PerlSV -> IO Bool 
    103 foreign import ccall "p5embed.h perl5_newSVpv" 
     103foreign import ccall "../../perl5/p5embed.h perl5_newSVpv" 
    104104    perl5_newSVpv :: CString -> IO PerlSV 
    105 foreign import ccall "p5embed.h perl5_newSViv" 
     105foreign import ccall "../../perl5/p5embed.h perl5_newSViv" 
    106106    perl5_newSViv :: CInt -> IO PerlSV 
    107 foreign import ccall "p5embed.h perl5_newSVnv" 
     107foreign import ccall "../../perl5/p5embed.h perl5_newSVnv" 
    108108    perl5_newSVnv :: CDouble -> IO PerlSV 
    109 foreign import ccall "p5embed.h perl5_get_sv" 
     109foreign import ccall "../../perl5/p5embed.h perl5_get_sv" 
    110110    perl5_get_sv :: CString -> IO PerlSV 
    111 foreign import ccall "p5embed.h perl5_apply" 
     111foreign import ccall "../../perl5/p5embed.h perl5_apply" 
    112112    perl5_apply :: PerlSV -> PerlSV -> Ptr PerlSV -> PugsVal -> CInt -> IO (Ptr PerlSV) 
    113 foreign import ccall "p5embed.h perl5_can" 
     113foreign import ccall "../../perl5/p5embed.h perl5_can" 
    114114    perl5_can :: PerlSV -> CString -> IO Bool 
    115 foreign import ccall "p5embed.h perl5_eval" 
     115foreign import ccall "../../perl5/p5embed.h perl5_eval" 
    116116    perl5_eval :: CString -> PugsVal -> CInt -> IO PerlSV 
    117 foreign import ccall "p5embed.h perl5_init" 
     117foreign import ccall "../../perl5/p5embed.h perl5_init" 
    118118    perl5_init :: CInt -> Ptr CString -> IO PerlInterpreter 
    119119 
    120 foreign import ccall "pugsembed.h pugs_getenv" 
     120foreign import ccall "../../perl5/pugsembed.h pugs_getenv" 
    121121    pugs_getenv :: IO PugsVal 
    122 foreign import ccall "pugsembed.h pugs_setenv" 
     122foreign import ccall "../../perl5/pugsembed.h pugs_setenv" 
    123123    pugs_setenv :: PugsVal -> IO () 
    124124 
    125 foreign import ccall "pugsembed.h pugs_SvToVal" 
     125foreign import ccall "../../perl5/pugsembed.h pugs_SvToVal" 
    126126    pugs_SvToVal :: PerlSV -> IO PugsVal 
    127 foreign import ccall "pugsembed.h pugs_MkValRef" 
     127foreign import ccall "../../perl5/pugsembed.h pugs_MkValRef" 
    128128    pugs_MkValRef :: PugsVal -> IO PerlSV 
    129129 

  • src/Pugs/Eval.hs

    r7565 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/Eval/Var.hs

    r7337 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -cpp #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.Eval.Var ( 

  • src/Pugs/Lexer.hs

    r6432 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/Parser.hs

    r7575 r7579  
    11{-# OPTIONS_GHC -cpp -fglasgow-exts -funbox-strict-fields -fno-full-laziness -fno-cse #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/Parser/Number.hs

    r6290 r7579  
    1 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     1{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    22 
    33module Pugs.Parser.Number ( 

  • src/Pugs/Pretty.hs

    r7541 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/Prim.hs

    r7552 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans -fno-full-laziness -fno-cse #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../UnicodeC.h" #-} 
    33 
    44{-| 

  • src/Pugs/Prim/Match.hs

    r7551 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.Prim.Match ( 

  • src/Pugs/Prim/Numeric.hs

    r5388 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.Prim.Numeric ( 

  • src/Pugs/Prim/Yaml.hs

    r2961 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts -fno-warn-orphans #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44module Pugs.Prim.Yaml ( 

  • src/Pugs/Rule/Char.hs

    r2009 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44----------------------------------------------------------------------------- 

  • src/Pugs/Rule/Token.hs

    r2610 r7579  
    11{-# OPTIONS_GHC -fglasgow-exts #-} 
    2 {-# OPTIONS_GHC -#include "UnicodeC.h" #-} 
     2{-# OPTIONS_GHC -#include "../../UnicodeC.h" #-} 
    33 
    44----------------------------------------------------------------------------- 

  • src/perl5/p5embed.c

    r7413 r7579  
    1 #include <p5embed.h> 
     1#include "p5embed.h" 
    22#include <XSUB.h> 
    33#include "perlxsi.c" 

  • src/perl5/pugsembed.c

    r6793 r7579  
    1 #include <pugsembed.h> 
     1#include "pugsembed.h" 
    22extern int __init; 
    33 

  • src/syck/yaml2byte.c

    r2786 r7579  
    1010 *   ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING! 
    1111 */  
    12 #include <syck.h> 
     12#include "syck.h" 
    1313#include <assert.h> 
    1414#define YAMLBYTE_UTF8 

  • util/yaml_harness.pl

    r7474 r7579  
    2323use File::Spec; 
    2424our @ISA = qw(Test::TAP::Model); 
    25 our $SMOKERFILE = ".smoker.yml"; 
     25our $SMOKERFILE = "debian/smoker.yml"; 
    2626 
    2727$| = 1;