From b6a0e0d086d5b314742b9ecc84f2392b5dada5c8 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Thu, 28 Jul 2011 00:05:58 +0200 Subject: [PATCH] polish the building process of the perl interface --- .../strawberry-importlib.bat | 9 + plugins/perl/importlib/perl512-x86.def | 1420 ----------------- plugins/perl/importlib/sbperl-x64.bat | 10 - plugins/perl/makefile-512.mak | 13 +- plugins/perl/makefile-514.mak | 2 +- .../perl512-x64.def => perl512.def} | 0 src/makeinc.skel.mak | 4 +- 7 files changed, 22 insertions(+), 1436 deletions(-) rename plugins/perl/importlib/sbperl-x86.bat => build/strawberry-importlib.bat (54%) delete mode 100644 plugins/perl/importlib/perl512-x86.def delete mode 100644 plugins/perl/importlib/sbperl-x64.bat rename plugins/perl/{importlib/perl512-x64.def => perl512.def} (100%) diff --git a/plugins/perl/importlib/sbperl-x86.bat b/build/strawberry-importlib.bat similarity index 54% rename from plugins/perl/importlib/sbperl-x86.bat rename to build/strawberry-importlib.bat index e0b1a3dd..61da96b3 100644 --- a/plugins/perl/importlib/sbperl-x86.bat +++ b/build/strawberry-importlib.bat @@ -8,3 +8,12 @@ echo.Please adjust the resulting file manually, then hit return! pause lib /machine:x86 /def:perl512.def pause +set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64 +cd c:\mozilla-build\perl-5.12-x64\perl\lib\CORE +echo.Overwrite existing def file? +pause +dumpbin /exports ..\..\bin\perl512.dll > perl512.def +echo.Please adjust the resulting file manually, then hit return! +pause +lib /machine:x64 /def:perl512.def +pause diff --git a/plugins/perl/importlib/perl512-x86.def b/plugins/perl/importlib/perl512-x86.def deleted file mode 100644 index 5cfcaa68..00000000 --- a/plugins/perl/importlib/perl512-x86.def +++ /dev/null @@ -1,1420 +0,0 @@ -LIBRARY perl512 -EXPORTS -PL_bincompat_options -PL_check -PL_fold -PL_fold_locale -PL_freq -PL_keyword_plugin -PL_memory_wrap -PL_no_aelem -PL_no_dir_func -PL_no_func -PL_no_helem_sv -PL_no_localize_ref -PL_no_mem -PL_no_modify -PL_no_myglob -PL_no_security -PL_no_sock_func -PL_no_symref -PL_no_usym -PL_no_wrongref -PL_op_desc -PL_op_name -PL_opargs -PL_perlio_mutex -PL_ppaddr -PL_reg_extflags_name -PL_reg_name -PL_regkind -PL_sig_name -PL_sig_num -PL_simple -PL_utf8skip -PL_uuemap -PL_varies -PL_vtbl_amagic -PL_vtbl_amagicelem -PL_vtbl_arylen -PL_vtbl_backref -PL_vtbl_bm -PL_vtbl_collxfrm -PL_vtbl_dbline -PL_vtbl_defelem -PL_vtbl_env -PL_vtbl_envelem -PL_vtbl_fm -PL_vtbl_isa -PL_vtbl_isaelem -PL_vtbl_mglob -PL_vtbl_nkeys -PL_vtbl_pack -PL_vtbl_packelem -PL_vtbl_pos -PL_vtbl_regdata -PL_vtbl_regdatum -PL_vtbl_regexp -PL_vtbl_sig -PL_vtbl_sigelem -PL_vtbl_substr -PL_vtbl_sv -PL_vtbl_taint -PL_vtbl_utf8 -PL_vtbl_uvar -PL_vtbl_vec -PL_warn_nl -PL_warn_nosemi -PL_warn_reserved -PL_warn_uninit -PerlIOBase_binmode -PerlIOBase_clearerr -PerlIOBase_close -PerlIOBase_dup -PerlIOBase_eof -PerlIOBase_error -PerlIOBase_fileno -PerlIOBase_noop_fail -PerlIOBase_noop_ok -PerlIOBase_popped -PerlIOBase_pushed -PerlIOBase_read -PerlIOBase_setlinebuf -PerlIOBase_unread -PerlIOBuf_bufsiz -PerlIOBuf_close -PerlIOBuf_dup -PerlIOBuf_fill -PerlIOBuf_flush -PerlIOBuf_get_base -PerlIOBuf_get_cnt -PerlIOBuf_get_ptr -PerlIOBuf_open -PerlIOBuf_popped -PerlIOBuf_pushed -PerlIOBuf_read -PerlIOBuf_seek -PerlIOBuf_set_ptrcnt -PerlIOBuf_tell -PerlIOBuf_unread -PerlIOBuf_write -PerlIO_allocate -PerlIO_apply_layera -PerlIO_apply_layers -PerlIO_arg_fetch -PerlIO_binmode -PerlIO_canset_cnt -PerlIO_debug -PerlIO_define_layer -PerlIO_exportFILE -PerlIO_fast_gets -PerlIO_fdopen -PerlIO_findFILE -PerlIO_find_layer -PerlIO_getc -PerlIO_getname -PerlIO_getpos -PerlIO_has_base -PerlIO_has_cntptr -PerlIO_importFILE -PerlIO_init -PerlIO_isutf8 -PerlIO_layer_fetch -PerlIO_list_alloc -PerlIO_list_free -PerlIO_modestr -PerlIO_open -PerlIO_parse_layers -PerlIO_pending -PerlIO_perlio -PerlIO_pop -PerlIO_printf -PerlIO_push -PerlIO_putc -PerlIO_puts -PerlIO_releaseFILE -PerlIO_reopen -PerlIO_rewind -PerlIO_setpos -PerlIO_sprintf -PerlIO_stdoutf -PerlIO_sv_dup -PerlIO_teardown -PerlIO_tmpfile -PerlIO_ungetc -PerlIO_vprintf -PerlIO_vsprintf -Perl_GNo_ptr -Perl_GYes_ptr -Perl_Gcheck_ptr -Perl_Gcsighandlerp_ptr -Perl_Gcurinterp_ptr -Perl_Gdo_undump_ptr -Perl_Gdollarzero_mutex_ptr -Perl_Gfold_locale_ptr -Perl_Ghexdigit_ptr -Perl_Ghints_mutex_ptr -Perl_Ginterp_size_5_10_0_ptr -Perl_Ginterp_size_ptr -Perl_Gkeyword_plugin_ptr -Perl_Gmy_ctx_mutex_ptr -Perl_Gmy_cxt_index_ptr -Perl_Gop_mutex_ptr -Perl_Gop_seq_ptr -Perl_Gop_sequence_ptr -Perl_Gpatleave_ptr -Perl_Gperlio_debug_fd_ptr -Perl_Gperlio_fd_refcnt_ptr -Perl_Gperlio_fd_refcnt_size_ptr -Perl_Gperlio_mutex_ptr -Perl_Gppaddr_ptr -Perl_Grevision_ptr -Perl_Grunops_dbg_ptr -Perl_Grunops_std_ptr -Perl_Gsh_path_ptr -Perl_Gsig_trapped_ptr -Perl_Gsigfpe_saved_ptr -Perl_Gsubversion_ptr -Perl_Gsv_placeholder_ptr -Perl_Gthr_key_ptr -Perl_Guse_safe_putenv_ptr -Perl_Gv_AMupdate -Perl_Gversion_ptr -Perl_Gveto_cleanup_ptr -Perl_IArgv_ptr -Perl_ICmd_ptr -Perl_IDBgv_ptr -Perl_IDBline_ptr -Perl_IDBsignal_ptr -Perl_IDBsingle_ptr -Perl_IDBsub_ptr -Perl_IDBtrace_ptr -Perl_IDir_ptr -Perl_IEnv_ptr -Perl_ILIO_ptr -Perl_IMemParse_ptr -Perl_IMemShared_ptr -Perl_IMem_ptr -Perl_IOpPtr_ptr -Perl_IOpSlab_ptr -Perl_IOpSpace_ptr -Perl_IProc_ptr -Perl_ISock_ptr -Perl_IStdIO_ptr -Perl_ISv_ptr -Perl_IXpv_ptr -Perl_Iamagic_generation_ptr -Perl_Ian_ptr -Perl_Iargvgv_ptr -Perl_Iargvout_stack_ptr -Perl_Iargvoutgv_ptr -Perl_Ibasetime_ptr -Perl_Ibeginav_ptr -Perl_Ibeginav_save_ptr -Perl_Ibody_arenas_ptr -Perl_Ibody_roots_ptr -Perl_Ibodytarget_ptr -Perl_Ibreakable_sub_gen_ptr -Perl_Icheckav_ptr -Perl_Icheckav_save_ptr -Perl_Ichopset_ptr -Perl_Iclocktick_ptr -Perl_Icollation_ix_ptr -Perl_Icollation_name_ptr -Perl_Icollation_standard_ptr -Perl_Icollxfrm_base_ptr -Perl_Icollxfrm_mult_ptr -Perl_Icolors_ptr -Perl_Icolorset_ptr -Perl_Icompcv_ptr -Perl_Icompiling_ptr -Perl_Icomppad_name_fill_ptr -Perl_Icomppad_name_floor_ptr -Perl_Icomppad_name_ptr -Perl_Icomppad_ptr -Perl_Icop_seqmax_ptr -Perl_Icurcop_ptr -Perl_Icurcopdb_ptr -Perl_Icurpad_ptr -Perl_Icurpm_ptr -Perl_Icurstack_ptr -Perl_Icurstackinfo_ptr -Perl_Icurstash_ptr -Perl_Icurstname_ptr -Perl_Icustom_op_descs_ptr -Perl_Icustom_op_names_ptr -Perl_Icv_has_eval_ptr -Perl_Idbargs_ptr -Perl_Idebstash_ptr -Perl_Idebug_pad_ptr -Perl_Idebug_ptr -Perl_Idef_layerlist_ptr -Perl_Idefgv_ptr -Perl_Idefoutgv_ptr -Perl_Idefstash_ptr -Perl_Idelaymagic_ptr -Perl_Idestroyhook_ptr -Perl_Idiehook_ptr -Perl_Idirty_ptr -Perl_Idoextract_ptr -Perl_Idoswitches_ptr -Perl_Idowarn_ptr -Perl_Idumpindent_ptr -Perl_Ie_script_ptr -Perl_Iefloatbuf_ptr -Perl_Iefloatsize_ptr -Perl_Iegid_ptr -Perl_Iencoding_ptr -Perl_Iendav_ptr -Perl_Ienvgv_ptr -Perl_Ierrgv_ptr -Perl_Ierrors_ptr -Perl_Ieuid_ptr -Perl_Ieval_root_ptr -Perl_Ieval_start_ptr -Perl_Ievalseq_ptr -Perl_Iexit_flags_ptr -Perl_Iexitlist_ptr -Perl_Iexitlistlen_ptr -Perl_Ifdpid_ptr -Perl_Ifilemode_ptr -Perl_Ifirstgv_ptr -Perl_Iforkprocess_ptr -Perl_Iformfeed_ptr -Perl_Iformtarget_ptr -Perl_Igensym_ptr -Perl_Igid_ptr -Perl_Iglob_index_ptr -Perl_Iglobalstash_ptr -Perl_Ihash_seed_ptr -Perl_Ihintgv_ptr -Perl_Ihints_ptr -Perl_Ihv_fetch_ent_mh_ptr -Perl_Iin_clean_all_ptr -Perl_Iin_clean_objs_ptr -Perl_Iin_eval_ptr -Perl_Iin_load_module_ptr -Perl_Iincgv_ptr -Perl_Iinitav_ptr -Perl_Iinplace_ptr -Perl_Iisarev_ptr -Perl_Iknown_layers_ptr -Perl_Ilast_in_gv_ptr -Perl_Ilast_swash_hv_ptr -Perl_Ilast_swash_key_ptr -Perl_Ilast_swash_klen_ptr -Perl_Ilast_swash_slen_ptr -Perl_Ilast_swash_tmps_ptr -Perl_Ilastfd_ptr -Perl_Ilastscream_ptr -Perl_Ilaststatval_ptr -Perl_Ilaststype_ptr -Perl_Ilocalizing_ptr -Perl_Ilocalpatches_ptr -Perl_Ilockhook_ptr -Perl_Imain_cv_ptr -Perl_Imain_root_ptr -Perl_Imain_start_ptr -Perl_Imainstack_ptr -Perl_Imarkstack_max_ptr -Perl_Imarkstack_ptr -Perl_Imarkstack_ptr_ptr -Perl_Imax_intro_pending_ptr -Perl_Imaxo_ptr -Perl_Imaxscream_ptr -Perl_Imaxsysfd_ptr -Perl_Imess_sv_ptr -Perl_Imin_intro_pending_ptr -Perl_Iminus_E_ptr -Perl_Iminus_F_ptr -Perl_Iminus_a_ptr -Perl_Iminus_c_ptr -Perl_Iminus_l_ptr -Perl_Iminus_n_ptr -Perl_Iminus_p_ptr -Perl_Imodglobal_ptr -Perl_Imy_cxt_list_ptr -Perl_Imy_cxt_size_ptr -Perl_Ina_ptr -Perl_Inice_chunk_ptr -Perl_Inice_chunk_size_ptr -Perl_Inomemok_ptr -Perl_Inumeric_local_ptr -Perl_Inumeric_name_ptr -Perl_Inumeric_radix_sv_ptr -Perl_Inumeric_standard_ptr -Perl_Iofsgv_ptr -Perl_Ioldname_ptr -Perl_Iop_mask_ptr -Perl_Iop_ptr -Perl_Iopfreehook_ptr -Perl_Iorigalen_ptr -Perl_Iorigargc_ptr -Perl_Iorigargv_ptr -Perl_Iorigenviron_ptr -Perl_Iorigfilename_ptr -Perl_Iors_sv_ptr -Perl_Iosname_ptr -Perl_Ipad_reset_pending_ptr -Perl_Ipadix_floor_ptr -Perl_Ipadix_ptr -Perl_Iparser_ptr -Perl_Ipatchlevel_ptr -Perl_Ipeepp_ptr -Perl_Iperl_destruct_level_ptr -Perl_Iperldb_ptr -Perl_Iperlio_ptr -Perl_Ipreambleav_ptr -Perl_Iprofiledata_ptr -Perl_Ipsig_name_ptr -Perl_Ipsig_pend_ptr -Perl_Ipsig_ptr_ptr -Perl_Iptr_table_ptr -Perl_Ireentrant_retint_ptr -Perl_Ireg_state_ptr -Perl_Iregdummy_ptr -Perl_Iregex_pad_ptr -Perl_Iregex_padav_ptr -Perl_Ireginterp_cnt_ptr -Perl_Iregistered_mros_ptr -Perl_Iregmatch_slab_ptr -Perl_Iregmatch_state_ptr -Perl_Irehash_seed_ptr -Perl_Irehash_seed_set_ptr -Perl_Ireplgv_ptr -Perl_Irestartop_ptr -Perl_Irs_ptr -Perl_Irunops_ptr -Perl_Isavebegin_ptr -Perl_Isavestack_ix_ptr -Perl_Isavestack_max_ptr -Perl_Isavestack_ptr -Perl_Isawampersand_ptr -Perl_Iscopestack_ix_ptr -Perl_Iscopestack_max_ptr -Perl_Iscopestack_name_ptr -Perl_Iscopestack_ptr -Perl_Iscreamfirst_ptr -Perl_Iscreamnext_ptr -Perl_Isecondgv_ptr -Perl_Isharehook_ptr -Perl_Isig_pending_ptr -Perl_Isighandlerp_ptr -Perl_Isignals_ptr -Perl_Isort_RealCmp_ptr -Perl_Isortcop_ptr -Perl_Isortstash_ptr -Perl_Isplitstr_ptr -Perl_Isrand_called_ptr -Perl_Istack_base_ptr -Perl_Istack_max_ptr -Perl_Istack_sp_ptr -Perl_Istart_env_ptr -Perl_Istashcache_ptr -Perl_Istatbuf_ptr -Perl_Istatcache_ptr -Perl_Istatgv_ptr -Perl_Istatname_ptr -Perl_Istatusvalue_posix_ptr -Perl_Istatusvalue_ptr -Perl_Istderrgv_ptr -Perl_Istdingv_ptr -Perl_Istrtab_ptr -Perl_Isub_generation_ptr -Perl_Isubline_ptr -Perl_Isubname_ptr -Perl_Isv_arenaroot_ptr -Perl_Isv_count_ptr -Perl_Isv_no_ptr -Perl_Isv_objcount_ptr -Perl_Isv_root_ptr -Perl_Isv_undef_ptr -Perl_Isv_yes_ptr -Perl_Isys_intern_ptr -Perl_Itaint_warn_ptr -Perl_Itainted_ptr -Perl_Itainting_ptr -Perl_Ithreadhook_ptr -Perl_Itmps_floor_ptr -Perl_Itmps_ix_ptr -Perl_Itmps_max_ptr -Perl_Itmps_stack_ptr -Perl_Itop_env_ptr -Perl_Itoptarget_ptr -Perl_Iuid_ptr -Perl_Iunicode_ptr -Perl_Iunitcheckav_ptr -Perl_Iunitcheckav_save_ptr -Perl_Iunlockhook_ptr -Perl_Iunsafe_ptr -Perl_Iutf8_X_LVT_ptr -Perl_Iutf8_X_LV_LVT_V_ptr -Perl_Iutf8_X_LV_ptr -Perl_Iutf8_X_L_ptr -Perl_Iutf8_X_T_ptr -Perl_Iutf8_X_V_ptr -Perl_Iutf8_X_begin_ptr -Perl_Iutf8_X_extend_ptr -Perl_Iutf8_X_non_hangul_ptr -Perl_Iutf8_X_prepend_ptr -Perl_Iutf8_alnum_ptr -Perl_Iutf8_alpha_ptr -Perl_Iutf8_ascii_ptr -Perl_Iutf8_cntrl_ptr -Perl_Iutf8_digit_ptr -Perl_Iutf8_graph_ptr -Perl_Iutf8_idcont_ptr -Perl_Iutf8_idstart_ptr -Perl_Iutf8_lower_ptr -Perl_Iutf8_mark_ptr -Perl_Iutf8_perl_space_ptr -Perl_Iutf8_perl_word_ptr -Perl_Iutf8_posix_digit_ptr -Perl_Iutf8_print_ptr -Perl_Iutf8_punct_ptr -Perl_Iutf8_space_ptr -Perl_Iutf8_tofold_ptr -Perl_Iutf8_tolower_ptr -Perl_Iutf8_totitle_ptr -Perl_Iutf8_toupper_ptr -Perl_Iutf8_upper_ptr -Perl_Iutf8_xdigit_ptr -Perl_Iutf8cache_ptr -Perl_Iutf8locale_ptr -Perl_Iwarnhook_ptr -Perl_PerlIO_clearerr -Perl_PerlIO_close -Perl_PerlIO_context_layers -Perl_PerlIO_eof -Perl_PerlIO_error -Perl_PerlIO_fileno -Perl_PerlIO_fill -Perl_PerlIO_flush -Perl_PerlIO_get_base -Perl_PerlIO_get_bufsiz -Perl_PerlIO_get_cnt -Perl_PerlIO_get_ptr -Perl_PerlIO_read -Perl_PerlIO_seek -Perl_PerlIO_set_cnt -Perl_PerlIO_set_ptrcnt -Perl_PerlIO_setlinebuf -Perl_PerlIO_stderr -Perl_PerlIO_stdin -Perl_PerlIO_stdout -Perl_PerlIO_tell -Perl_PerlIO_unread -Perl_PerlIO_write -Perl_Slab_Alloc -Perl_Slab_Free -Perl_amagic_call -Perl_any_dup -Perl_apply_attrs_string -Perl_atfork_lock -Perl_atfork_unlock -Perl_av_arylen_p -Perl_av_clear -Perl_av_delete -Perl_av_exists -Perl_av_extend -Perl_av_fetch -Perl_av_fill -Perl_av_iter_p -Perl_av_len -Perl_av_make -Perl_av_pop -Perl_av_push -Perl_av_reify -Perl_av_shift -Perl_av_store -Perl_av_undef -Perl_av_unshift -Perl_block_gimme -Perl_bytes_from_utf8 -Perl_bytes_to_utf8 -Perl_call_argv -Perl_call_atexit -Perl_call_list -Perl_call_method -Perl_call_pv -Perl_call_sv -Perl_calloc -Perl_cast_i32 -Perl_cast_iv -Perl_cast_ulong -Perl_cast_uv -Perl_ck_warner -Perl_ck_warner_d -Perl_ckwarn -Perl_ckwarn_d -Perl_croak -Perl_croak_nocontext -Perl_croak_xs_usage -Perl_csighandler -Perl_custom_op_desc -Perl_custom_op_name -Perl_cv_const_sv -Perl_cv_undef -Perl_cx_dump -Perl_cx_dup -Perl_cxinc -Perl_deb -Perl_deb_nocontext -Perl_delimcpy -Perl_despatch_signals -Perl_die -Perl_die_nocontext -Perl_dirp_dup -Perl_do_aexec -Perl_do_aspawn -Perl_do_binmode -Perl_do_close -Perl_do_gv_dump -Perl_do_gvgv_dump -Perl_do_hv_dump -Perl_do_join -Perl_do_magic_dump -Perl_do_op_dump -Perl_do_open -Perl_do_open9 -Perl_do_openn -Perl_do_pmop_dump -Perl_do_spawn -Perl_do_spawn_nowait -Perl_do_sprintf -Perl_do_sv_dump -Perl_doing_taint -Perl_doref -Perl_dounwind -Perl_dowantarray -Perl_dump_all -Perl_dump_eval -Perl_dump_form -Perl_dump_indent -Perl_dump_packsubs -Perl_dump_sub -Perl_dump_vindent -Perl_emulate_cop_io -Perl_eval_pv -Perl_eval_sv -Perl_fbm_compile -Perl_fbm_instr -Perl_fetch_cop_label -Perl_filter_add -Perl_filter_del -Perl_filter_read -Perl_find_runcv -Perl_find_rundefsvoffset -Perl_form -Perl_form_nocontext -Perl_fp_dup -Perl_fprintf_nocontext -Perl_free_tmps -Perl_get_av -Perl_get_context -Perl_get_cv -Perl_get_cvn_flags -Perl_get_hv -Perl_get_op_descs -Perl_get_op_names -Perl_get_ppaddr -Perl_get_re_arg -Perl_get_sv -Perl_get_vtbl -Perl_getcwd_sv -Perl_gp_dup -Perl_gp_free -Perl_gp_ref -Perl_grok_bin -Perl_grok_hex -Perl_grok_number -Perl_grok_numeric_radix -Perl_grok_oct -Perl_gv_AVadd -Perl_gv_HVadd -Perl_gv_IOadd -Perl_gv_SVadd -Perl_gv_add_by_type -Perl_gv_autoload4 -Perl_gv_check -Perl_gv_const_sv -Perl_gv_dump -Perl_gv_efullname -Perl_gv_efullname3 -Perl_gv_efullname4 -Perl_gv_fetchfile -Perl_gv_fetchfile_flags -Perl_gv_fetchmeth -Perl_gv_fetchmeth_autoload -Perl_gv_fetchmethod -Perl_gv_fetchmethod_autoload -Perl_gv_fetchmethod_flags -Perl_gv_fetchpv -Perl_gv_fetchpvn_flags -Perl_gv_fetchsv -Perl_gv_fullname -Perl_gv_fullname3 -Perl_gv_fullname4 -Perl_gv_handler -Perl_gv_init -Perl_gv_name_set -Perl_gv_stashpv -Perl_gv_stashpvn -Perl_gv_stashsv -Perl_gv_try_downgrade -Perl_he_dup -Perl_hek_dup -Perl_hv_clear -Perl_hv_clear_placeholders -Perl_hv_common -Perl_hv_common_key_len -Perl_hv_delayfree_ent -Perl_hv_delete -Perl_hv_delete_ent -Perl_hv_eiter_p -Perl_hv_eiter_set -Perl_hv_exists -Perl_hv_exists_ent -Perl_hv_fetch -Perl_hv_fetch_ent -Perl_hv_free_ent -Perl_hv_iterinit -Perl_hv_iterkey -Perl_hv_iterkeysv -Perl_hv_iternext -Perl_hv_iternext_flags -Perl_hv_iternextsv -Perl_hv_iterval -Perl_hv_ksplit -Perl_hv_magic -Perl_hv_name_set -Perl_hv_placeholders_get -Perl_hv_placeholders_p -Perl_hv_placeholders_set -Perl_hv_riter_p -Perl_hv_riter_set -Perl_hv_scalar -Perl_hv_store -Perl_hv_store_ent -Perl_hv_store_flags -Perl_hv_undef -Perl_ibcmp -Perl_ibcmp_locale -Perl_ibcmp_utf8 -Perl_init_i18nl10n -Perl_init_i18nl14n -Perl_init_os_extras -Perl_init_stacks -Perl_init_tm -Perl_instr -Perl_is_ascii_string -Perl_is_lvalue_sub -Perl_is_uni_alnum -Perl_is_uni_alnum_lc -Perl_is_uni_alpha -Perl_is_uni_alpha_lc -Perl_is_uni_ascii -Perl_is_uni_ascii_lc -Perl_is_uni_cntrl -Perl_is_uni_cntrl_lc -Perl_is_uni_digit -Perl_is_uni_digit_lc -Perl_is_uni_graph -Perl_is_uni_graph_lc -Perl_is_uni_idfirst -Perl_is_uni_idfirst_lc -Perl_is_uni_lower -Perl_is_uni_lower_lc -Perl_is_uni_print -Perl_is_uni_print_lc -Perl_is_uni_punct -Perl_is_uni_punct_lc -Perl_is_uni_space -Perl_is_uni_space_lc -Perl_is_uni_upper -Perl_is_uni_upper_lc -Perl_is_uni_xdigit -Perl_is_uni_xdigit_lc -Perl_is_utf8_X_L -Perl_is_utf8_X_LV -Perl_is_utf8_X_LVT -Perl_is_utf8_X_LV_LVT_V -Perl_is_utf8_X_T -Perl_is_utf8_X_V -Perl_is_utf8_X_begin -Perl_is_utf8_X_extend -Perl_is_utf8_X_non_hangul -Perl_is_utf8_X_prepend -Perl_is_utf8_alnum -Perl_is_utf8_alpha -Perl_is_utf8_ascii -Perl_is_utf8_char -Perl_is_utf8_cntrl -Perl_is_utf8_digit -Perl_is_utf8_graph -Perl_is_utf8_idcont -Perl_is_utf8_idfirst -Perl_is_utf8_lower -Perl_is_utf8_mark -Perl_is_utf8_perl_space -Perl_is_utf8_perl_word -Perl_is_utf8_posix_digit -Perl_is_utf8_print -Perl_is_utf8_punct -Perl_is_utf8_space -Perl_is_utf8_string -Perl_is_utf8_string_loc -Perl_is_utf8_string_loclen -Perl_is_utf8_upper -Perl_is_utf8_xdigit -Perl_leave_scope -Perl_lex_bufutf8 -Perl_lex_discard_to -Perl_lex_end -Perl_lex_grow_linestr -Perl_lex_next_chunk -Perl_lex_peek_unichar -Perl_lex_read_space -Perl_lex_read_to -Perl_lex_read_unichar -Perl_lex_stuff_pvn -Perl_lex_stuff_sv -Perl_lex_unstuff -Perl_load_module -Perl_load_module_nocontext -Perl_looks_like_number -Perl_magic_dump -Perl_malloc -Perl_markstack_grow -Perl_mess -Perl_mess_nocontext -Perl_mfree -Perl_mg_clear -Perl_mg_copy -Perl_mg_dup -Perl_mg_find -Perl_mg_free -Perl_mg_get -Perl_mg_length -Perl_mg_magical -Perl_mg_set -Perl_mg_size -Perl_mini_mktime -Perl_mod -Perl_moreswitches -Perl_mro_get_from_name -Perl_mro_get_linear_isa -Perl_mro_get_private_data -Perl_mro_meta_init -Perl_mro_method_changed_in -Perl_mro_register -Perl_mro_set_mro -Perl_mro_set_private_data -Perl_my_atof -Perl_my_atof2 -Perl_my_cxt_init -Perl_my_dirfd -Perl_my_exit -Perl_my_failure_exit -Perl_my_fflush_all -Perl_my_fork -Perl_my_lstat -Perl_my_popen_list -Perl_my_setenv -Perl_my_snprintf -Perl_my_socketpair -Perl_my_stat -Perl_my_strftime -Perl_my_strlcat -Perl_my_strlcpy -Perl_my_vsnprintf -Perl_newANONATTRSUB -Perl_newANONHASH -Perl_newANONLIST -Perl_newANONSUB -Perl_newASSIGNOP -Perl_newATTRSUB -Perl_newAV -Perl_newAVREF -Perl_newBINOP -Perl_newCONDOP -Perl_newCONSTSUB -Perl_newCVREF -Perl_newFORM -Perl_newFOROP -Perl_newGIVENOP -Perl_newGVOP -Perl_newGVREF -Perl_newGVgen -Perl_newHV -Perl_newHVREF -Perl_newHVhv -Perl_newIO -Perl_newLISTOP -Perl_newLOGOP -Perl_newLOOPEX -Perl_newLOOPOP -Perl_newMYSUB -Perl_newNULLLIST -Perl_newOP -Perl_newPADOP -Perl_newPMOP -Perl_newPROG -Perl_newPVOP -Perl_newRANGE -Perl_newRV -Perl_newRV_noinc -Perl_newSLICEOP -Perl_newSTATEOP -Perl_newSUB -Perl_newSV -Perl_newSVOP -Perl_newSVREF -Perl_newSV_type -Perl_newSVhek -Perl_newSViv -Perl_newSVnv -Perl_newSVpv -Perl_newSVpvf -Perl_newSVpvf_nocontext -Perl_newSVpvn -Perl_newSVpvn_flags -Perl_newSVpvn_share -Perl_newSVrv -Perl_newSVsv -Perl_newSVuv -Perl_newUNOP -Perl_newWHENOP -Perl_newWHILEOP -Perl_newXS -Perl_newXS_flags -Perl_new_collate -Perl_new_ctype -Perl_new_numeric -Perl_new_stackinfo -Perl_new_version -Perl_new_warnings_bitfield -Perl_ninstr -Perl_nothreadhook -Perl_op_clear -Perl_op_dump -Perl_op_free -Perl_op_null -Perl_op_refcnt_lock -Perl_op_refcnt_unlock -Perl_pack_cat -Perl_packlist -Perl_pad_findmy -Perl_pad_push -Perl_parser_dup -Perl_pmflag -Perl_pmop_dump -Perl_pop_scope -Perl_pregcomp -Perl_pregexec -Perl_pregfree -Perl_pregfree2 -Perl_prescan_version -Perl_printf_nocontext -Perl_ptr_table_clear -Perl_ptr_table_fetch -Perl_ptr_table_free -Perl_ptr_table_new -Perl_ptr_table_split -Perl_ptr_table_store -Perl_push_scope -Perl_pv_display -Perl_pv_escape -Perl_pv_pretty -Perl_pv_uni_display -Perl_qerror -Perl_re_compile -Perl_re_dup_guts -Perl_re_intuit_start -Perl_re_intuit_string -Perl_realloc -Perl_reentrant_free -Perl_reentrant_init -Perl_reentrant_retry -Perl_reentrant_size -Perl_ref -Perl_refcounted_he_chain_2hv -Perl_refcounted_he_fetch -Perl_refcounted_he_new -Perl_reg_named_buff -Perl_reg_named_buff_all -Perl_reg_named_buff_exists -Perl_reg_named_buff_fetch -Perl_reg_named_buff_firstkey -Perl_reg_named_buff_iter -Perl_reg_named_buff_nextkey -Perl_reg_named_buff_scalar -Perl_reg_numbered_buff_fetch -Perl_reg_numbered_buff_length -Perl_reg_numbered_buff_store -Perl_reg_qr_package -Perl_reg_temp_copy -Perl_regclass_swash -Perl_regcurly -Perl_regdump -Perl_regdupe_internal -Perl_regexec_flags -Perl_regfree_internal -Perl_reginitcolors -Perl_regnext -Perl_repeatcpy -Perl_report_uninit -Perl_require_pv -Perl_rninstr -Perl_rsignal -Perl_rsignal_state -Perl_runops_debug -Perl_runops_standard -Perl_rvpv_dup -Perl_safesyscalloc -Perl_safesysfree -Perl_safesysmalloc -Perl_safesysrealloc -Perl_save_I16 -Perl_save_I32 -Perl_save_I8 -Perl_save_adelete -Perl_save_aelem_flags -Perl_save_alloc -Perl_save_aptr -Perl_save_ary -Perl_save_bool -Perl_save_clearsv -Perl_save_delete -Perl_save_destructor -Perl_save_destructor_x -Perl_save_freeop -Perl_save_freepv -Perl_save_freesv -Perl_save_generic_pvref -Perl_save_generic_svref -Perl_save_gp -Perl_save_hash -Perl_save_hdelete -Perl_save_helem_flags -Perl_save_hptr -Perl_save_int -Perl_save_item -Perl_save_iv -Perl_save_list -Perl_save_long -Perl_save_mortalizesv -Perl_save_nogv -Perl_save_op -Perl_save_padsv_and_mortalize -Perl_save_pptr -Perl_save_pushptr -Perl_save_re_context -Perl_save_scalar -Perl_save_set_svflags -Perl_save_shared_pvref -Perl_save_sptr -Perl_save_svref -Perl_save_vptr -Perl_savepv -Perl_savepvn -Perl_savesharedpv -Perl_savesharedpvn -Perl_savestack_grow -Perl_savestack_grow_cnt -Perl_savesvpv -Perl_scan_bin -Perl_scan_hex -Perl_scan_num -Perl_scan_oct -Perl_scan_version -Perl_scan_vstring -Perl_screaminstr -Perl_seed -Perl_set_context -Perl_set_numeric_local -Perl_set_numeric_radix -Perl_set_numeric_standard -Perl_setdefout -Perl_share_hek -Perl_si_dup -Perl_signbit -Perl_sortsv -Perl_sortsv_flags -Perl_ss_dup -Perl_stack_grow -Perl_start_subparse -Perl_stashpv_hvname_match -Perl_str_to_version -Perl_sv_2bool -Perl_sv_2cv -Perl_sv_2io -Perl_sv_2iv -Perl_sv_2iv_flags -Perl_sv_2mortal -Perl_sv_2nv -Perl_sv_2pv -Perl_sv_2pv_flags -Perl_sv_2pv_nolen -Perl_sv_2pvbyte -Perl_sv_2pvbyte_nolen -Perl_sv_2pvutf8 -Perl_sv_2pvutf8_nolen -Perl_sv_2uv -Perl_sv_2uv_flags -Perl_sv_backoff -Perl_sv_bless -Perl_sv_cat_decode -Perl_sv_catpv -Perl_sv_catpv_mg -Perl_sv_catpvf -Perl_sv_catpvf_mg -Perl_sv_catpvf_mg_nocontext -Perl_sv_catpvf_nocontext -Perl_sv_catpvn -Perl_sv_catpvn_flags -Perl_sv_catpvn_mg -Perl_sv_catsv -Perl_sv_catsv_flags -Perl_sv_catsv_mg -Perl_sv_chop -Perl_sv_clear -Perl_sv_cmp -Perl_sv_cmp_locale -Perl_sv_collxfrm -Perl_sv_compile_2op -Perl_sv_copypv -Perl_sv_dec -Perl_sv_derived_from -Perl_sv_destroyable -Perl_sv_does -Perl_sv_dump -Perl_sv_dup -Perl_sv_eq -Perl_sv_force_normal -Perl_sv_force_normal_flags -Perl_sv_free -Perl_sv_free2 -Perl_sv_gets -Perl_sv_grow -Perl_sv_inc -Perl_sv_insert -Perl_sv_insert_flags -Perl_sv_isa -Perl_sv_isobject -Perl_sv_iv -Perl_sv_len -Perl_sv_len_utf8 -Perl_sv_magic -Perl_sv_magicext -Perl_sv_mortalcopy -Perl_sv_newmortal -Perl_sv_newref -Perl_sv_nolocking -Perl_sv_nosharing -Perl_sv_nounlocking -Perl_sv_nv -Perl_sv_peek -Perl_sv_pos_b2u -Perl_sv_pos_u2b -Perl_sv_pos_u2b_flags -Perl_sv_pv -Perl_sv_pvbyte -Perl_sv_pvbyten -Perl_sv_pvbyten_force -Perl_sv_pvn -Perl_sv_pvn_force -Perl_sv_pvn_force_flags -Perl_sv_pvn_nomg -Perl_sv_pvutf8 -Perl_sv_pvutf8n -Perl_sv_pvutf8n_force -Perl_sv_recode_to_utf8 -Perl_sv_reftype -Perl_sv_replace -Perl_sv_report_used -Perl_sv_reset -Perl_sv_rvweaken -Perl_sv_setiv -Perl_sv_setiv_mg -Perl_sv_setnv -Perl_sv_setnv_mg -Perl_sv_setpv -Perl_sv_setpv_mg -Perl_sv_setpvf -Perl_sv_setpvf_mg -Perl_sv_setpvf_mg_nocontext -Perl_sv_setpvf_nocontext -Perl_sv_setpviv -Perl_sv_setpviv_mg -Perl_sv_setpvn -Perl_sv_setpvn_mg -Perl_sv_setref_iv -Perl_sv_setref_nv -Perl_sv_setref_pv -Perl_sv_setref_pvn -Perl_sv_setref_uv -Perl_sv_setsv -Perl_sv_setsv_flags -Perl_sv_setsv_mg -Perl_sv_setuv -Perl_sv_setuv_mg -Perl_sv_taint -Perl_sv_tainted -Perl_sv_true -Perl_sv_uni_display -Perl_sv_unmagic -Perl_sv_unref -Perl_sv_unref_flags -Perl_sv_untaint -Perl_sv_upgrade -Perl_sv_usepvn -Perl_sv_usepvn_flags -Perl_sv_usepvn_mg -Perl_sv_utf8_decode -Perl_sv_utf8_downgrade -Perl_sv_utf8_encode -Perl_sv_utf8_upgrade -Perl_sv_utf8_upgrade_flags_grow -Perl_sv_uv -Perl_sv_vcatpvf -Perl_sv_vcatpvf_mg -Perl_sv_vcatpvfn -Perl_sv_vsetpvf -Perl_sv_vsetpvf_mg -Perl_sv_vsetpvfn -Perl_swash_fetch -Perl_swash_init -Perl_sys_init -Perl_sys_init3 -Perl_sys_intern_clear -Perl_sys_intern_dup -Perl_sys_intern_init -Perl_sys_term -Perl_taint_env -Perl_taint_proper -Perl_tmps_grow -Perl_to_uni_fold -Perl_to_uni_lower -Perl_to_uni_lower_lc -Perl_to_uni_title -Perl_to_uni_title_lc -Perl_to_uni_upper -Perl_to_uni_upper_lc -Perl_to_utf8_case -Perl_to_utf8_fold -Perl_to_utf8_lower -Perl_to_utf8_title -Perl_to_utf8_upper -Perl_unpack_str -Perl_unpackstring -Perl_unsharepvn -Perl_upg_version -Perl_utf16_to_utf8 -Perl_utf16_to_utf8_reversed -Perl_utf8_distance -Perl_utf8_hop -Perl_utf8_length -Perl_utf8_to_bytes -Perl_utf8_to_uvchr -Perl_utf8_to_uvuni -Perl_utf8n_to_uvchr -Perl_utf8n_to_uvuni -Perl_uvchr_to_utf8 -Perl_uvchr_to_utf8_flags -Perl_uvuni_to_utf8 -Perl_uvuni_to_utf8_flags -Perl_vcmp -Perl_vcroak -Perl_vdeb -Perl_vform -Perl_vivify_defelem -Perl_vload_module -Perl_vmess -Perl_vnewSVpvf -Perl_vnormal -Perl_vnumify -Perl_vstringify -Perl_vverify -Perl_vwarn -Perl_vwarner -Perl_warn -Perl_warn_nocontext -Perl_warner -Perl_warner_nocontext -Perl_whichsig -Perl_win32_init -Perl_win32_term -Perl_yylex -RunPerl -boot_DynaLoader -boot_Win32CORE -init_Win32CORE -perl_alloc -perl_alloc_override -perl_alloc_using -perl_clone -perl_clone_host -perl_clone_using -perl_construct -perl_destruct -perl_free -perl_get_host_info -perl_parse -perl_run -perlsio_binmode -setgid -setuid -win32_abort -win32_accept -win32_access -win32_alarm -win32_ansipath -win32_async_check -win32_bind -win32_calloc -win32_chdir -win32_chmod -win32_chsize -win32_clearenv -win32_clearerr -win32_close -win32_closedir -win32_closesocket -win32_connect -win32_crypt -win32_dup -win32_dup2 -win32_dynaload -win32_endhostent -win32_endnetent -win32_endprotoent -win32_endservent -win32_environ -win32_eof -win32_errno -win32_execv -win32_execvp -win32_fclose -win32_fcloseall -win32_fdopen -win32_feof -win32_ferror -win32_fflush -win32_fgetc -win32_fgetpos -win32_fgets -win32_fileno -win32_flock -win32_flushall -win32_fopen -win32_fprintf -win32_fputc -win32_fputs -win32_fread -win32_free -win32_free_childdir -win32_free_childenv -win32_freopen -win32_fseek -win32_fsetpos -win32_fstat -win32_ftell -win32_fwrite -win32_get_childdir -win32_get_childenv -win32_get_osfhandle -win32_getc -win32_getchar -win32_getenv -win32_gethostbyaddr -win32_gethostbyname -win32_gethostname -win32_getnetbyaddr -win32_getnetbyname -win32_getnetent -win32_getpeername -win32_getpid -win32_getprotobyname -win32_getprotobynumber -win32_getprotoent -win32_gets -win32_getservbyname -win32_getservbyport -win32_getservent -win32_getsockname -win32_getsockopt -win32_gettimeofday -win32_htonl -win32_htons -win32_inet_addr -win32_inet_ntoa -win32_ioctl -win32_ioctlsocket -win32_isatty -win32_kill -win32_link -win32_listen -win32_longpath -win32_lseek -win32_malloc -win32_mkdir -win32_ntohl -win32_ntohs -win32_open -win32_open_osfhandle -win32_opendir -win32_os_id -win32_pclose -win32_perror -win32_pipe -win32_popen -win32_printf -win32_putc -win32_putchar -win32_putenv -win32_puts -win32_read -win32_readdir -win32_realloc -win32_recv -win32_recvfrom -win32_rename -win32_rewind -win32_rewinddir -win32_rmdir -win32_seekdir -win32_select -win32_send -win32_sendto -win32_setbuf -win32_sethostent -win32_setmode -win32_setnetent -win32_setprotoent -win32_setservent -win32_setsockopt -win32_setvbuf -win32_shutdown -win32_sleep -win32_socket -win32_spawnvp -win32_stat -win32_stderr -win32_stdin -win32_stdout -win32_str_os_error -win32_strerror -win32_tell -win32_telldir -win32_times -win32_tmpfile -win32_uname -win32_ungetc -win32_unlink -win32_utime -win32_vfprintf -win32_vprintf -win32_wait -win32_waitpid -win32_write diff --git a/plugins/perl/importlib/sbperl-x64.bat b/plugins/perl/importlib/sbperl-x64.bat deleted file mode 100644 index a27ab442..00000000 --- a/plugins/perl/importlib/sbperl-x64.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64 -cd c:\mozilla-build\perl-5.12-x64\perl\lib\CORE -echo.Overwrite existing def file? -pause -dumpbin /exports ..\..\bin\perl512.dll > perl512.def -echo.Please adjust the resulting file manually, then hit return! -pause -lib /machine:x64 /def:perl512.def -pause diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak index 15f78a23..a77dc145 100644 --- a/plugins/perl/makefile-512.mak +++ b/plugins/perl/makefile-512.mak @@ -12,15 +12,22 @@ perl.def: echo xchat_plugin_get_info >> perl.def perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH) /I.. /DPERL_DLL=\"$(PERL512LIB).dll\" + $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH)\perl\lib\CORE /I.. /DPERL_DLL=\"$(PERL512LIB).dll\" + +$(PERL512LIB).lib: perl512.def +!ifdef X64 + lib /machine:x64 /def:perl512.def +!else + lib /machine:x86 /def:perl512.def +!endif perl.c: xchat.pm.h xchat.pm.h: lib/Xchat.pm lib/IRC.pm perl.exe generate_header -$(TARGET): perl.obj perl.def - $(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL512LIB).lib /libpath:$(PERL512PATH) /delayload:$(PERL512LIB).dll $(DIRENTLIB) delayimp.lib user32.lib shell32.lib advapi32.lib /def:perl.def +$(TARGET): perl.obj perl.def $(PERL512LIB).lib + $(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL512LIB).lib /delayload:$(PERL512LIB).dll $(DIRENTLIB) delayimp.lib user32.lib shell32.lib advapi32.lib /def:perl.def clean: @del $(TARGET) diff --git a/plugins/perl/makefile-514.mak b/plugins/perl/makefile-514.mak index 8c689979..4d8181dd 100644 --- a/plugins/perl/makefile-514.mak +++ b/plugins/perl/makefile-514.mak @@ -12,7 +12,7 @@ perl.def: echo xchat_plugin_get_info >> perl.def perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH) /I.. /DPERL_DLL=\"$(PERL514LIB).dll\" + $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH)\lib\CORE /I.. /DPERL_DLL=\"$(PERL514LIB).dll\" perl.c: xchat.pm.h diff --git a/plugins/perl/importlib/perl512-x64.def b/plugins/perl/perl512.def similarity index 100% rename from plugins/perl/importlib/perl512-x64.def rename to plugins/perl/perl512.def diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak index 5c6beb6f..1d6d23cc 100644 --- a/src/makeinc.skel.mak +++ b/src/makeinc.skel.mak @@ -30,8 +30,8 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj -PERL512PATH = c:\mozilla-build\perl-5.12-x64\perl\lib\CORE -PERL514PATH = c:\mozilla-build\perl-5.14-x64\lib\CORE +PERL512PATH = c:\mozilla-build\perl-5.12-x64 +PERL514PATH = c:\mozilla-build\perl-5.14-x64 PYTHONPATH = c:\mozilla-build\python-2.7-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64 !else