Skip to content

Commit

Permalink
Don't include version number in directory holding dyncall; it'll just…
Browse files Browse the repository at this point in the history
… make every upgrade annoying.
  • Loading branch information
jnthn committed Nov 27, 2011
1 parent 003586e commit c9d6b20
Show file tree
Hide file tree
Showing 234 changed files with 20 additions and 10 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions 3rdparty/dyncall/ConfigVars
@@ -0,0 +1,10 @@
# auto-generated by configure.bat
CONFIG_PACKAGE=dyncall#
CONFIG_HOST=windows#
CONFIG_OS=windows#
CONFIG_ARCH=x64#
CONFIG_TOOL=msvc#
CONFIG_ASM=ml#
CONFIG_CONFIG=release#
CONFIG_PREFIX=C:\consulting\rakudo\nqp\3rdparty\dyncall\install_windows_x64_msvc_release#
CONFIG_BUILDPREFIX=C:\consulting\rakudo\nqp\3rdparty\dyncall\build_out\windows_x64_msvc_release#
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions Configure.pl
Expand Up @@ -110,13 +110,13 @@
my $make = fill_template_text('@make@', %config);

if ($make eq 'nmake') {
system_or_die('cd 3rdparty\dyncall-0.6 && Configure.bat' .
system_or_die('cd 3rdparty\dyncall && Configure.bat' .
($config{'parrot::archname'} =~ /x64/ ? ' /target-x64' : ''));
$config{'dyncall_build'} = 'cd 3rdparty\dyncall-0.6 && nmake Nmakefile';
$config{'dyncall_build'} = 'cd 3rdparty\dyncall && nmake Nmakefile';
}
else {
system_or_die('cd 3rdparty/dyncall-0.6 && sh configure');
$config{'dyncall_build'} = "cd 3rdparty/dyncall-0.6 && BUILD_DIR=. $make";
system_or_die('cd 3rdparty/dyncall && sh configure');
$config{'dyncall_build'} = "cd 3rdparty/dyncall && BUILD_DIR=. $make";
}

fill_template_file('tools/build/Makefile.in', 'Makefile', %config);
Expand Down
12 changes: 6 additions & 6 deletions tools/build/Makefile.in
Expand Up @@ -445,9 +445,9 @@ LIBTOMMATH_SOURCE = 3rdparty/libtommath/bncore.c \
BIGINT_OPS = nqp_bigint_ops
BIGINT_OPS_SOURCE = nqp_bigint.ops

DYNCALL_BIN = 3rdparty/dyncall-0.6/dyncall/libdyncall_s$(A) \
3rdparty/dyncall-0.6/dyncallback/libdyncallback_s$(A) \
3rdparty/dyncall-0.6/dynload/libdynload_s$(A)
DYNCALL_BIN = 3rdparty/dyncall/dyncall/libdyncall_s$(A) \
3rdparty/dyncall/dyncallback/libdyncallback_s$(A) \
3rdparty/dyncall/dynload/libdynload_s$(A)

DYNCALL_OPS = nqp_dyncall_ops
DYNCALL_OPS_SOURCE = nqp_dyncall.ops
Expand Down Expand Up @@ -945,10 +945,10 @@ $(DYNCALL_BIN):

$(OPS_DIR)/$(DYNCALL_OPS)$(LOAD_EXT): $(OPS_DIR)/$(DYNCALL_OPS_SOURCE) $(DYNCALL_BIN) src/6model/reprs/NativeCall.c src/6model/reprs/NativeCall.h src/6model/reprs/CStruct.c src/6model/reprs/CStruct.h
cd $(OPS_DIR) && $(OPS2C) C --dynamic $(DYNCALL_OPS_SOURCE)
cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(DYNCALL_OPS)$(O) $(CINCLUDES) -I../../3rdparty/dyncall-0.6 $(CFLAGS) $(DYNCALL_OPS).c
cd src/6model/reprs && $(CC) -c @cc_o_out@NativeCall$(O) -I../../../$(PMC_DIR) -I../../../3rdparty/dyncall-0.6 $(CINCLUDES) $(CFLAGS) NativeCall.c
cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(DYNCALL_OPS)$(O) $(CINCLUDES) -I../../3rdparty/dyncall $(CFLAGS) $(DYNCALL_OPS).c
cd src/6model/reprs && $(CC) -c @cc_o_out@NativeCall$(O) -I../../../$(PMC_DIR) -I../../../3rdparty/dyncall $(CINCLUDES) $(CFLAGS) NativeCall.c
cd src/6model/reprs && $(CC) -c @cc_o_out@CStruct$(O) -I../../../$(PMC_DIR) $(CINCLUDES) $(CFLAGS) CStruct.c
cd $(OPS_DIR) && $(LD) @ld_out@$(DYNCALL_OPS)$(LOAD_EXT) $(DYNCALL_OPS)$(O) ../6model/reprs/NativeCall$(O) ../6model/reprs/CStruct$(O) ../../3rdparty/dyncall-0.6/dyncall/libdyncall_s$(A) ../../3rdparty/dyncall-0.6/dyncallback/libdyncallback_s$(A) ../../3rdparty/dyncall-0.6/dynload/libdynload_s$(A) $(LINKARGS)
cd $(OPS_DIR) && $(LD) @ld_out@$(DYNCALL_OPS)$(LOAD_EXT) $(DYNCALL_OPS)$(O) ../6model/reprs/NativeCall$(O) ../6model/reprs/CStruct$(O) ../../3rdparty/dyncall/dyncall/libdyncall_s$(A) ../../3rdparty/dyncall/dyncallback/libdyncallback_s$(A) ../../3rdparty/dyncall/dynload/libdynload_s$(A) $(LINKARGS)

bootstrap-files: $(STAGE2_PBCS) src/stage2/$(CORE_SETTING_NQP)
$(PERL) tools/build/gen-bootstrap.pl src/Regex.pir >src/stage0/Regex-s0.pir
Expand Down

0 comments on commit c9d6b20

Please sign in to comment.