From fd1d8cdc09ed86e4a0812120a17ff0d7b04adcaf Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 16 Jan 1998 12:19:22 +0000 Subject: *** empty log message *** git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/RUBY@11 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile | 42 +++--- win32/ruby.def | 439 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 429 insertions(+), 52 deletions(-) (limited to 'win32') diff --git a/win32/Makefile b/win32/Makefile index 29d2101479..c7e8b8dbec 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -15,10 +15,10 @@ INSTALL_DATA = $(INSTALL) -m 644 PURIFY = -#CFLAGS = -nologo -DNT=1 -Ox -#LDFLAGS = $(CFLAGS) -Fm -CFLAGS = -nologo -DNT=1 -Zi -MD -LDFLAGS = $(CFLAGS) -Fm -MD +CFLAGS = -nologo -DNT=1 -Ox +LDFLAGS = $(CFLAGS) -Fm +#CFLAGS = -nologo -DNT=1 -Zi -MD +#LDFLAGS = $(CFLAGS) -Fm -MD LIBS = $(EXTLIBS) advapi32.lib wsock32.lib MISSING = crypt.obj setenv.obj alloca.obj nt.obj @@ -29,6 +29,8 @@ bindir = libdir = STACK = 0x200000 +ORGLIBPATH = $(LIB) +#MISCLIBS = win32\sdbm.lib #### End of system configuration section. #### @@ -56,6 +58,7 @@ OBJS = array.obj \ inits.obj \ io.obj \ math.obj \ + marshal.obj \ numeric.obj \ object.obj \ pack.obj \ @@ -77,31 +80,29 @@ OBJS = array.obj \ version.obj \ $(MISSING) -all: miniruby.exe ext/Setup +all: miniruby.exe ext/Setup $(MISCLIBS) cd ext + set LIB=..\..\win32;$(ORGLIBPATH) ..\miniruby .\extmk.rb static +# ..\miniruby .\extmk.rb cd .. miniruby.exe: $(OBJS) $(MAINOBJ) $(EXTOBJS) @echo $(EXTOBJS) @echo $(LIBS) @rm -f miniruby.exe -# $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(LIBS) -o miniruby.exe - $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(LIBS) -o miniruby.exe -link /NOD:LIBC + $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(LIBS) -o miniruby.exe -ruby.exe: $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) ruby.dll - @echo $(EXTOBJS) - @echo $(LIBS) +ruby.exe: $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) rubymw.dll @rm -f ruby.exe # $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY) $(LIBS) -o ruby.exe -# $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY) $(LIBS) -o ruby.exe -link /DEF:rubyexe.def /NOD:LIBC - $(CC) $(LDFLAGS) $(MAINOBJ) -o ruby.exe ruby.lib -link /NOD:LIBC /STACK:$(STACK) + $(CC) $(LDFLAGS) $(MAINOBJ) -o ruby.exe rubymw.lib -link /STACK:$(STACK) -ruby.dll: $(LIBRUBY) $(EXTOBJS) - @echo $(EXTOBJS) - @echo $(LIBS) - @rm -f ruby.dll - $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY) $(LIBS) -o ruby.dll -link /DLL /DEF:ruby.def /NOD:LIBC +rubymw.dll: $(LIBRUBY) $(EXTOBJS) + set LIB=.\win32;$(ORGLIBPATH) + @rm -f rubymw.dll + $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY) $(LIBS) -o rubymw.dll -link /DLL /DEF:ruby.def + @mv rubymw.map rubydll.map $(LIBRUBY): $(OBJS) lib /OUT:$(LIBRUBY) $(OBJS) @@ -188,6 +189,13 @@ parse.c: parse.y sed -e "s!^extern char \*getenv();!/* & */!" y.tab.c > parse.c @rm y.tab.c +win32\sdbm.lib : win32\sdbm.c win32\sdbm.h + cd win32 + $(CC) $(CFLAGS) $(CPPFLAGS) -DMSDOS -c sdbm.c + lib /OUT:sdbm.lib sdbm.obj + copy sdbm.h ndbm.h + cd .. + # Prevent GNU make v3 from overflowing arg limit on SysV. .NOEXPORT: ### diff --git a/win32/ruby.def b/win32/ruby.def index 44372d2e76..e8ece2ae50 100644 --- a/win32/ruby.def +++ b/win32/ruby.def @@ -1,55 +1,424 @@ -LIBRARY ruby.dll +LIBRARY rubymw.dll CODE LOADONCALL DATA LOADONCALL -DESCRIPTION 'win32 ruby.dll' +DESCRIPTION 'win32 rubymw.dll' EXPORTS +;global objects +;array.c: + cArray +;bignum.c: + cBignum +;eval.c: + cProc +;file.c: + cFile +;hash.c: + cHash +;io.c: + cIO +;numeric.c: + cNumeric + cFloat + cInteger + cFixnum +;object.c + cObject + cModule + cClass + cFixnum + cData +;re.c: + cRegexp +;string.c: + cString + cStruct +; procedures/methods ;missing/nt.c NtInitialize -;eval.c - ruby_init - ruby_options - ruby_run + myfdopen + myaccept + mybind + myconnect + mygetpeername + mygetsockname + mygetsockopt + myioctlsocket + mylisten + myrecv + myrecvfrom + mysend + mysendto + mysetsockopt + myshutdown + mysocket + mygethostbyaddr + mygethostbyname + mygethostname + mygetprotobyname + mygetprotobynumber + mygetservbyname + mygetservbyport +;array.c + memclear + ary_freeze + ary_new2 + ary_new + ary_new3 + ary_new4 + assoc_new + ary_store + ary_push + ary_pop + ary_shift + ary_unshift + ary_entry + ary_each + ary_join + ary_to_s + ary_reverse + ary_sort_bang + ary_sort + ary_delete + ary_delete_at + ary_plus + ary_concat + ary_assoc + ary_rassoc + ary_includes +;bignum.c + big_clone + big_2comp + big_norm + uint2big + int2big + uint2inum + int2inum + str2inum + big2str + big2int + big_to_i + dbl2big + big2dbl + big_to_f + big_plus + big_minus + big_mul + big_pow + big_and + big_or + big_xor + big_lshift + big_rand ;class.c - ;;rb_define_module_function - ;;rb_define_const - ;;rb_define_singleton_method - ;;rb_define_alias - rb_define_alias - rb_define_attr - rb_define_class + class_new + singleton_class_new + singleton_class_clone rb_define_class_id + rb_define_class rb_define_class_under - rb_define_global_function - rb_define_method - rb_define_method_id - rb_define_module - rb_define_module_function + module_new rb_define_module_id + rb_define_module rb_define_module_under + rb_include_module + rb_define_method_id + rb_define_method + rb_undef_method rb_define_private_method + rb_singleton_class rb_define_singleton_method + rb_define_module_function + rb_define_global_function + rb_define_alias + rb_define_attr rb_scan_args -;variable.c - rb_define_const - rb_define_hooked_variable - rb_define_global_const - rb_define_readonly_variable - rb_define_variable - rb_define_virtual_variable -;string.c +; dln.c + dln_load + dln_find_exe + dln_find_file +; enum.c + rb_each + enum_length +; error.c + Error + Error_Append + Warning + Bug + rb_check_type + exc_new + exc_new2 + exc_new3 + Raise + TypeError + ArgError + NameError + IndexError + Fail + rb_notimplement + LoadError + Fatal + rb_sys_fail +;eval.c + rb_clear_cache + rb_add_method + rb_alias + rb_method_boundp + dyna_var_defined + dyna_var_ref + dyna_var_asgn + rb_safe_level + rb_set_safe_level + rb_check_safe_str + rb_secure + ruby_init + ruby_options + ruby_run + rb_eval_string + rb_eval_cmd + rb_trap_eval + rb_test_false_or_nil + rb_respond_to + rb_exit + rb_raise + rb_fatal + rb_interrupt + iterator_p + rb_yield_0 + rb_yield + rb_iterate + rb_rescue + rb_ensure + rb_apply + rb_funcall + rb_funcall2 + rb_backtrace + rb_frame_last_func + f_load + rb_provide + f_require + class_new_instance + rb_extend_object + f_lambda + gc_mark_threads + thread_schedule + thread_wait_fd + thread_fd_writable + thread_wait_for + thread_alone + thread_select + thread_sleep + thread_sleep_forever + thread_create + thread_interrupt +; file.c + file_open + eaccess + file_s_expand_path +; gc.c + xmalloc + xcalloc + xrealloc + gc_s_enable + gc_s_disable + rb_global_variable + rb_newobj + data_object_alloc + gc_mark_locations + gc_mark_maybe + gc_mark + gc_force_recycle + gc_mark_frame + gc_gc +; hash.c + rb_hash + hash_new + hash_aref + hash_aset +; inits.c + rb_call_inits +; io.c + eof_error + io_writable + io_readable + io_write + io_gets_method + io_gets + io_getc + io_ungetc + io_fptr_finalize + io_close + io_binmode + io_mode_flags + rb_fopen + rb_fdopen + io_unbuffered + io_reopen + f_gets + rb_str_setter +; numeric.c + num_zerodiv + num_coerce_bin + float_new + flo_pow + num2int + num2fix + fix2str + fix_to_s + num_upto + fix_upto +; object.c + rb_equal + rb_eql + obj_equal + any_to_s + rb_inspect + obj_is_instance_of + obj_is_kind_of + obj_alloc + rb_to_id + rb_class_of + rb_type + rb_special_const_p + rb_Integer + rb_Float + rb_String + rb_Array +; parse.c + ;;compile_string + ;;compile_file + ;;node_newnode + nodetype + nodeline + id_attrset + rb_intern + rb_id2name + rb_is_const_id + rb_is_instance_id + local_var_append + backref_get + backref_set + lastline_get + lastline_set +; process.c + rb_proc_exec + rb_syswait +; range.c + range_new + range_beg_end +; re.c + str_cicmp + reg_search + reg_nth_defined + reg_nth_match + reg_last_match + reg_match_pre + reg_match_post + reg_match_last + reg_free + reg_new + reg_regcomp + reg_match + reg_match2 + reg_regsub + rb_set_kcode +; ruby.c + rb_require_modules + rb_load_file + ruby_script + ruby_prog_init + ruby_set_argv + ruby_process_options +; signal.c + gc_mark_trap_list + rb_trap_exit + rb_trap_exec +; st.c + st_init_table_with_size + st_init_table + st_init_numtable + st_init_strtable + st_free_table + st_lookup + st_insert + st_add_direct + st_find_or_add + st_copy + st_delete + st_delete_safe + st_foreach +; string.c str_new str_new2 str_new3 str_new4 -;numeric.c - num2int - -;error.c - rb_check_type - Fatal + obj_as_string + str_dup + str_plus + str_times + str_substr + str_modify + str_freeze + str_dup_freezed + str_taint + str_tainted + str_resize + str_cat + str_hash + str_cmp + str_upto + str_inspect + str_split +; struct.c + struct_getmember + struct_define + struct_alloc + struct_new + struct_aref + struct_aset +; time.c + time_new + time_timeval +; util.c + scan_oct + scan_hex + add_suffix +;variable.c + new_idhash + rb_class_path + rb_set_class_path + rb_path2class + rb_name_class + rb_autoload + f_autoload + rb_class2name + rb_global_entry + gc_mark_global_tbl + rb_define_hooked_variable + rb_define_variable + rb_define_readonly_variable + rb_define_virtual_variable + rb_gvar_get + rb_gvar_set + rb_gvar_set2 + rb_gvar_defined + rb_alias_variable + rb_ivar_get + rb_ivar_set + rb_ivar_defined + rb_const_get_at + rb_const_get + mod_constants + rb_const_defined_at + rb_autoload_defined + rb_const_defined + rb_const_set + rb_define_const + rb_define_global_const + rb_iv_get + rb_iv_set +; version.c + show_version + show_copyright -;gc.c - xmalloc - xcalloc -- cgit v1.2.3