Browse files

Merge branch 'dev' into major

* dev:
  tar_SUITE: Work around limited pathname length on Windows
  Merge the fourth bootstrap stage into the third bootstrap stage
  Remove unused lib/orber/include/Makefile
  Remove lib/orber/include/* from the primary bootstrap
  otp_build update_primary: Don't commit generated source files
  primary bootstrap: Remove source files

Conflicts:
	Makefile.in
	bootstrap/bin/start.script
	bootstrap/bin/start_clean.script
	bootstrap/lib/compiler/ebin/compiler.app
	bootstrap/lib/compiler/egen/beam_opcodes.erl
	bootstrap/lib/compiler/egen/core_parse.erl
	bootstrap/lib/kernel/ebin/kernel.app
	bootstrap/lib/kernel/ebin/kernel.appup
	bootstrap/lib/orber/include/Makefile
	bootstrap/lib/orber/include/corba.hrl
	bootstrap/lib/orber/include/orber_pi.hrl
	bootstrap/lib/stdlib/ebin/stdlib.app
	bootstrap/lib/stdlib/ebin/stdlib.appup
	bootstrap/lib/stdlib/egen/erl_parse.erl
  • Loading branch information...
2 parents bdc4bab + 692772c commit 70fa7fabed2fb4f47155f02a1c8fa4054a546739 @bjorng bjorng committed Sep 19, 2011
View
8 .gitignore
@@ -15,6 +15,12 @@ autom4te.cache
!/erts/preloaded/ebin/*.beam
!/lib/*/test/*_SUITE_data/*.beam
+#
+# Generated source code files.
+#
+/bootstrap/lib/compiler/egen
+/bootstrap/lib/stdlib/egen
+
# Compiler derivatives
#
# Do not use too creative wildcards.
@@ -101,12 +107,12 @@ IDL-GENERATED
/bootstrap/bin/*
/bootstrap/target
-!/bootstrap/bin/*.script
!/bootstrap/bin/*.boot
/bootstrap/lib/asn1
/bootstrap/lib/hipe
/bootstrap/lib/ic
+/bootstrap/lib/orber
/bootstrap/lib/parsetools
/bootstrap/lib/sasl
/bootstrap/lib/snmp
View
24 Makefile.in
@@ -351,8 +351,7 @@ endif
all_bootstraps: emulator \
bootstrap_setup \
secondary_bootstrap_build secondary_bootstrap_copy \
- tertiary_bootstrap_build tertiary_bootstrap_copy \
- fourth_bootstrap_build fourth_bootstrap_copy
+ tertiary_bootstrap_build tertiary_bootstrap_copy
#
# Use these targets when you want to use the erl and erlc
@@ -539,6 +538,8 @@ secondary_bootstrap_copy:
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; fi
+ if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/orber ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/orber ; fi
+ if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include ; fi
for x in lib/parsetools/ebin/*.beam; do \
BN=`basename $$x`; \
TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin/$$BN; \
@@ -586,6 +587,16 @@ secondary_bootstrap_copy:
true; \
done
# cp -f lib/asn1/src/*.erl lib/asn1/src/*.hrl $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src
+ for x in lib/orber/include/*.hrl; do \
+ BN=`basename $$x`; \
+ TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include/$$BN; \
+ test -f $$TF && \
+ test '!' -z "`find $$x -newer $$TF -print`" && \
+ cp $$x $$TF; \
+ test '!' -f $$TF && \
+ cp $$x $$TF; \
+ true; \
+ done
tertiary_bootstrap_build:
cd lib && \
@@ -607,13 +618,6 @@ tertiary_bootstrap_copy:
true; \
done
# cp lib/snmp/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin
-
-fourth_bootstrap_build:
- cd lib && \
- ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
- $(MAKE) opt FOURTH_BOOTSTRAP=true
-
-fourth_bootstrap_copy:
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; fi
@@ -700,7 +704,6 @@ fourth_bootstrap_copy:
cp $$x $$TF; \
true; \
done
-
# cp lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin
.PHONY: check_recreate_primary_bootstrap recreate_primary_bootstrap
@@ -853,6 +856,7 @@ $(TEST_DIRS):
if test -f $@/Makefile; then \
(cd $@; $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests) || exit $$?; \
fi
+
#
# Install
#
View
113 bootstrap/bin/start.script
@@ -1,113 +0,0 @@
-%% script generated at {2011,8,25} {11,38,20}
-{script,
- {"OTP APN 181 01","R15A"},
- [{preLoaded,
- [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
- zlib]},
- {progress,preloaded},
- {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
- {primLoad,[error_handler]},
- {kernel_load_completed},
- {progress,kernel_load_completed},
- {path,["$ROOT/lib/kernel/ebin"]},
- {primLoad,
- [application,application_controller,application_master,
- application_starter,auth,code,code_server,disk_log,disk_log_1,
- disk_log_server,disk_log_sup,dist_ac,dist_util,erl_boot_server,
- erl_ddll,erl_distribution,erl_epmd,erl_reply,error_logger,
- erts_debug,file,file_io_server,file_server,gen_sctp,gen_tcp,gen_udp,
- global,global_group,global_search,group,heart,hipe_unified_loader,
- inet,inet6_sctp,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,
- inet_db,inet_dns,inet_gethost_native,inet_hosts,inet_parse,inet_res,
- inet_sctp,inet_tcp,inet_tcp_dist,inet_udp,kernel,kernel_config,net,
- net_adm,net_kernel,os,packages,pg2,ram_file,rpc,seq_trace,
- standard_error,user,user_drv,user_sup,wrap_log_reader]},
- {path,["$ROOT/lib/stdlib/ebin"]},
- {primLoad,
- [array,base64,beam_lib,binary,c,calendar,dets,dets_server,dets_sup,
- dets_utils,dets_v8,dets_v9,dict,digraph,digraph_utils,edlin,
- edlin_expand,epp,erl_bits,erl_compile,erl_eval,erl_expand_records,
- erl_internal,erl_lint,erl_parse,erl_posix_msg,erl_pp,erl_scan,
- erl_tar,error_logger_file_h,error_logger_tty_h,escript,ets,
- eval_bits,file_sorter,filelib,filename,gb_sets,gb_trees,gen,
- gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,io_lib_fread,
- io_lib_pretty,lib,lists,log_mf_h,math,ms_transform,orddict,ordsets,
- otp_internal,pg,pool,proc_lib,proplists,qlc,qlc_pt,queue,random,re,
- regexp,sets,shell,shell_default,slave,sofs,string,supervisor,
- supervisor_bridge,sys,timer,unicode,win32reg,zip]},
- {progress,modules_loaded},
- {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
- {kernelProcess,heart,{heart,start,[]}},
- {kernelProcess,error_logger,{error_logger,start_link,[]}},
- {kernelProcess,application_controller,
- {application_controller,start,
- [{application,kernel,
- [{description,"ERTS CXC 138 10"},
- {vsn,"2.15"},
- {id,[]},
- {modules,
- [application,application_controller,application_master,
- application_starter,auth,code,packages,code_server,
- dist_util,erl_boot_server,erl_distribution,erl_reply,
- error_handler,error_logger,file,file_server,
- file_io_server,global,global_group,global_search,
- group,heart,hipe_unified_loader,inet6_tcp,
- inet6_tcp_dist,inet6_udp,inet6_sctp,inet_config,
- inet_hosts,inet_gethost_native,inet_tcp_dist,kernel,
- kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,
- user,user_drv,user_sup,disk_log,disk_log_1,
- disk_log_server,disk_log_sup,dist_ac,erl_ddll,
- erl_epmd,erts_debug,gen_tcp,gen_udp,gen_sctp,inet,
- inet_db,inet_dns,inet_parse,inet_res,inet_tcp,
- inet_udp,inet_sctp,pg2,seq_trace,standard_error,
- wrap_log_reader]},
- {registered,
- [application_controller,erl_reply,auth,boot_server,
- code_server,disk_log_server,disk_log_sup,
- erl_prim_loader,error_logger,file_server_2,
- fixtable_server,global_group,global_name_server,heart,
- init,kernel_config,kernel_sup,net_kernel,net_sup,rex,
- user,os_server,ddll_server,erl_epmd,inet_db,pg2]},
- {applications,[]},
- {included_applications,[]},
- {env,[{error_logger,tty}]},
- {start_phases,undefined},
- {maxT,infinity},
- {maxP,infinity},
- {mod,{kernel,[]}}]}]}},
- {progress,init_kernel_started},
- {apply,
- {application,load,
- [{application,stdlib,
- [{description,"ERTS CXC 138 10"},
- {vsn,"1.18"},
- {id,[]},
- {modules,
- [array,base64,beam_lib,binary,c,calendar,dets,
- dets_server,dets_sup,dets_utils,dets_v8,dets_v9,dict,
- digraph,digraph_utils,edlin,edlin_expand,epp,
- eval_bits,erl_bits,erl_compile,erl_eval,
- erl_expand_records,erl_internal,erl_lint,erl_parse,
- erl_posix_msg,erl_pp,erl_scan,erl_tar,
- error_logger_file_h,error_logger_tty_h,escript,ets,
- file_sorter,filelib,filename,gb_trees,gb_sets,gen,
- gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,
- io_lib_fread,io_lib_pretty,lib,lists,log_mf_h,math,
- ms_transform,orddict,ordsets,otp_internal,pg,pool,
- proc_lib,proplists,qlc,qlc_pt,queue,random,re,regexp,
- sets,shell,shell_default,slave,sofs,string,supervisor,
- supervisor_bridge,sys,timer,unicode,win32reg,zip]},
- {registered,
- [timer_server,rsh_starter,take_over_monitor,
- pool_master,dets]},
- {applications,[kernel]},
- {included_applications,[]},
- {env,[]},
- {start_phases,undefined},
- {maxT,infinity},
- {maxP,infinity}]}]}},
- {progress,applications_loaded},
- {apply,{application,start_boot,[kernel,permanent]}},
- {apply,{application,start_boot,[stdlib,permanent]}},
- {apply,{c,erlangrc,[]}},
- {progress,started}]}.
View
113 bootstrap/bin/start_clean.script
@@ -1,113 +0,0 @@
-%% script generated at {2011,8,25} {11,38,20}
-{script,
- {"OTP APN 181 01","R15A"},
- [{preLoaded,
- [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
- zlib]},
- {progress,preloaded},
- {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
- {primLoad,[error_handler]},
- {kernel_load_completed},
- {progress,kernel_load_completed},
- {path,["$ROOT/lib/kernel/ebin"]},
- {primLoad,
- [application,application_controller,application_master,
- application_starter,auth,code,code_server,disk_log,disk_log_1,
- disk_log_server,disk_log_sup,dist_ac,dist_util,erl_boot_server,
- erl_ddll,erl_distribution,erl_epmd,erl_reply,error_logger,
- erts_debug,file,file_io_server,file_server,gen_sctp,gen_tcp,gen_udp,
- global,global_group,global_search,group,heart,hipe_unified_loader,
- inet,inet6_sctp,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,
- inet_db,inet_dns,inet_gethost_native,inet_hosts,inet_parse,inet_res,
- inet_sctp,inet_tcp,inet_tcp_dist,inet_udp,kernel,kernel_config,net,
- net_adm,net_kernel,os,packages,pg2,ram_file,rpc,seq_trace,
- standard_error,user,user_drv,user_sup,wrap_log_reader]},
- {path,["$ROOT/lib/stdlib/ebin"]},
- {primLoad,
- [array,base64,beam_lib,binary,c,calendar,dets,dets_server,dets_sup,
- dets_utils,dets_v8,dets_v9,dict,digraph,digraph_utils,edlin,
- edlin_expand,epp,erl_bits,erl_compile,erl_eval,erl_expand_records,
- erl_internal,erl_lint,erl_parse,erl_posix_msg,erl_pp,erl_scan,
- erl_tar,error_logger_file_h,error_logger_tty_h,escript,ets,
- eval_bits,file_sorter,filelib,filename,gb_sets,gb_trees,gen,
- gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,io_lib_fread,
- io_lib_pretty,lib,lists,log_mf_h,math,ms_transform,orddict,ordsets,
- otp_internal,pg,pool,proc_lib,proplists,qlc,qlc_pt,queue,random,re,
- regexp,sets,shell,shell_default,slave,sofs,string,supervisor,
- supervisor_bridge,sys,timer,unicode,win32reg,zip]},
- {progress,modules_loaded},
- {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
- {kernelProcess,heart,{heart,start,[]}},
- {kernelProcess,error_logger,{error_logger,start_link,[]}},
- {kernelProcess,application_controller,
- {application_controller,start,
- [{application,kernel,
- [{description,"ERTS CXC 138 10"},
- {vsn,"2.15"},
- {id,[]},
- {modules,
- [application,application_controller,application_master,
- application_starter,auth,code,packages,code_server,
- dist_util,erl_boot_server,erl_distribution,erl_reply,
- error_handler,error_logger,file,file_server,
- file_io_server,global,global_group,global_search,
- group,heart,hipe_unified_loader,inet6_tcp,
- inet6_tcp_dist,inet6_udp,inet6_sctp,inet_config,
- inet_hosts,inet_gethost_native,inet_tcp_dist,kernel,
- kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,
- user,user_drv,user_sup,disk_log,disk_log_1,
- disk_log_server,disk_log_sup,dist_ac,erl_ddll,
- erl_epmd,erts_debug,gen_tcp,gen_udp,gen_sctp,inet,
- inet_db,inet_dns,inet_parse,inet_res,inet_tcp,
- inet_udp,inet_sctp,pg2,seq_trace,standard_error,
- wrap_log_reader]},
- {registered,
- [application_controller,erl_reply,auth,boot_server,
- code_server,disk_log_server,disk_log_sup,
- erl_prim_loader,error_logger,file_server_2,
- fixtable_server,global_group,global_name_server,heart,
- init,kernel_config,kernel_sup,net_kernel,net_sup,rex,
- user,os_server,ddll_server,erl_epmd,inet_db,pg2]},
- {applications,[]},
- {included_applications,[]},
- {env,[{error_logger,tty}]},
- {start_phases,undefined},
- {maxT,infinity},
- {maxP,infinity},
- {mod,{kernel,[]}}]}]}},
- {progress,init_kernel_started},
- {apply,
- {application,load,
- [{application,stdlib,
- [{description,"ERTS CXC 138 10"},
- {vsn,"1.18"},
- {id,[]},
- {modules,
- [array,base64,beam_lib,binary,c,calendar,dets,
- dets_server,dets_sup,dets_utils,dets_v8,dets_v9,dict,
- digraph,digraph_utils,edlin,edlin_expand,epp,
- eval_bits,erl_bits,erl_compile,erl_eval,
- erl_expand_records,erl_internal,erl_lint,erl_parse,
- erl_posix_msg,erl_pp,erl_scan,erl_tar,
- error_logger_file_h,error_logger_tty_h,escript,ets,
- file_sorter,filelib,filename,gb_trees,gb_sets,gen,
- gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,
- io_lib_fread,io_lib_pretty,lib,lists,log_mf_h,math,
- ms_transform,orddict,ordsets,otp_internal,pg,pool,
- proc_lib,proplists,qlc,qlc_pt,queue,random,re,regexp,
- sets,shell,shell_default,slave,sofs,string,supervisor,
- supervisor_bridge,sys,timer,unicode,win32reg,zip]},
- {registered,
- [timer_server,rsh_starter,take_over_monitor,
- pool_master,dets]},
- {applications,[kernel]},
- {included_applications,[]},
- {env,[]},
- {start_phases,undefined},
- {maxT,infinity},
- {maxP,infinity}]}]}},
- {progress,applications_loaded},
- {apply,{application,start_boot,[kernel,permanent]}},
- {apply,{application,start_boot,[stdlib,permanent]}},
- {apply,{c,erlangrc,[]}},
- {progress,started}]}.
View
67 bootstrap/lib/compiler/ebin/compiler.app
@@ -1,67 +0,0 @@
-% This is an -*- erlang -*- file.
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-
-{application, compiler,
- [{description, "ERTS CXC 138 10"},
- {vsn, "4.7.4"},
- {modules, [
- beam_asm,
- beam_block,
- beam_bool,
- beam_bsm,
- beam_clean,
- beam_dead,
- beam_dict,
- beam_disasm,
- beam_flatten,
- beam_jump,
- beam_listing,
- beam_opcodes,
- beam_peep,
- beam_receive,
- beam_trim,
- beam_type,
- beam_utils,
- beam_validator,
- cerl,
- cerl_clauses,
- cerl_inline,
- cerl_trees,
- compile,
- core_scan,
- core_lint,
- core_parse,
- core_pp,
- core_lib,
- erl_bifs,
- rec_env,
- sys_core_dsetel,
- sys_core_fold,
- sys_core_inline,
- sys_expand_pmod,
- sys_pre_attributes,
- sys_pre_expand,
- v3_codegen,
- v3_core,
- v3_kernel,
- v3_kernel_pp,
- v3_life
- ]},
- {registered, []},
- {applications, [kernel, stdlib]},
- {env, []}]}.
View
1 bootstrap/lib/compiler/ebin/compiler.appup
@@ -1 +0,0 @@
-{"4.7.1",[],[]}.
View
321 bootstrap/lib/compiler/egen/beam_opcodes.erl
@@ -1,321 +0,0 @@
--module(beam_opcodes).
-%% Warning: Do not edit this file.
-%% Auto-generated by 'beam_makeops'.
-
--export([format_number/0]).
--export([opcode/2,opname/1]).
-
--spec format_number() -> 0.
-format_number() -> 0.
-
--spec opcode(atom(), 0..8) -> 1..153.
-opcode(label, 1) -> 1;
-opcode(func_info, 3) -> 2;
-opcode(int_code_end, 0) -> 3;
-opcode(call, 2) -> 4;
-opcode(call_last, 3) -> 5;
-opcode(call_only, 2) -> 6;
-opcode(call_ext, 2) -> 7;
-opcode(call_ext_last, 3) -> 8;
-opcode(bif0, 2) -> 9;
-opcode(bif1, 4) -> 10;
-opcode(bif2, 5) -> 11;
-opcode(allocate, 2) -> 12;
-opcode(allocate_heap, 3) -> 13;
-opcode(allocate_zero, 2) -> 14;
-opcode(allocate_heap_zero, 3) -> 15;
-opcode(test_heap, 2) -> 16;
-opcode(init, 1) -> 17;
-opcode(deallocate, 1) -> 18;
-opcode(return, 0) -> 19;
-opcode(send, 0) -> 20;
-opcode(remove_message, 0) -> 21;
-opcode(timeout, 0) -> 22;
-opcode(loop_rec, 2) -> 23;
-opcode(loop_rec_end, 1) -> 24;
-opcode(wait, 1) -> 25;
-opcode(wait_timeout, 2) -> 26;
-%%opcode(m_plus, 4) -> 27;
-%%opcode(m_minus, 4) -> 28;
-%%opcode(m_times, 4) -> 29;
-%%opcode(m_div, 4) -> 30;
-%%opcode(int_div, 4) -> 31;
-%%opcode(int_rem, 4) -> 32;
-%%opcode(int_band, 4) -> 33;
-%%opcode(int_bor, 4) -> 34;
-%%opcode(int_bxor, 4) -> 35;
-%%opcode(int_bsl, 4) -> 36;
-%%opcode(int_bsr, 4) -> 37;
-%%opcode(int_bnot, 3) -> 38;
-opcode(is_lt, 3) -> 39;
-opcode(is_ge, 3) -> 40;
-opcode(is_eq, 3) -> 41;
-opcode(is_ne, 3) -> 42;
-opcode(is_eq_exact, 3) -> 43;
-opcode(is_ne_exact, 3) -> 44;
-opcode(is_integer, 2) -> 45;
-opcode(is_float, 2) -> 46;
-opcode(is_number, 2) -> 47;
-opcode(is_atom, 2) -> 48;
-opcode(is_pid, 2) -> 49;
-opcode(is_reference, 2) -> 50;
-opcode(is_port, 2) -> 51;
-opcode(is_nil, 2) -> 52;
-opcode(is_binary, 2) -> 53;
-%%opcode(is_constant, 2) -> 54;
-opcode(is_list, 2) -> 55;
-opcode(is_nonempty_list, 2) -> 56;
-opcode(is_tuple, 2) -> 57;
-opcode(test_arity, 3) -> 58;
-opcode(select_val, 3) -> 59;
-opcode(select_tuple_arity, 3) -> 60;
-opcode(jump, 1) -> 61;
-opcode('catch', 2) -> 62;
-opcode(catch_end, 1) -> 63;
-opcode(move, 2) -> 64;
-opcode(get_list, 3) -> 65;
-opcode(get_tuple_element, 3) -> 66;
-opcode(set_tuple_element, 3) -> 67;
-%%opcode(put_string, 3) -> 68;
-opcode(put_list, 3) -> 69;
-opcode(put_tuple, 2) -> 70;
-opcode(put, 1) -> 71;
-opcode(badmatch, 1) -> 72;
-opcode(if_end, 0) -> 73;
-opcode(case_end, 1) -> 74;
-opcode(call_fun, 1) -> 75;
-%%opcode(make_fun, 3) -> 76;
-opcode(is_function, 2) -> 77;
-opcode(call_ext_only, 2) -> 78;
-%%opcode(bs_start_match, 2) -> 79;
-%%opcode(bs_get_integer, 5) -> 80;
-%%opcode(bs_get_float, 5) -> 81;
-%%opcode(bs_get_binary, 5) -> 82;
-%%opcode(bs_skip_bits, 4) -> 83;
-%%opcode(bs_test_tail, 2) -> 84;
-%%opcode(bs_save, 1) -> 85;
-%%opcode(bs_restore, 1) -> 86;
-%%opcode(bs_init, 2) -> 87;
-%%opcode(bs_final, 2) -> 88;
-opcode(bs_put_integer, 5) -> 89;
-opcode(bs_put_binary, 5) -> 90;
-opcode(bs_put_float, 5) -> 91;
-opcode(bs_put_string, 2) -> 92;
-%%opcode(bs_need_buf, 1) -> 93;
-opcode(fclearerror, 0) -> 94;
-opcode(fcheckerror, 1) -> 95;
-opcode(fmove, 2) -> 96;
-opcode(fconv, 2) -> 97;
-opcode(fadd, 4) -> 98;
-opcode(fsub, 4) -> 99;
-opcode(fmul, 4) -> 100;
-opcode(fdiv, 4) -> 101;
-opcode(fnegate, 3) -> 102;
-opcode(make_fun2, 1) -> 103;
-opcode('try', 2) -> 104;
-opcode(try_end, 1) -> 105;
-opcode(try_case, 1) -> 106;
-opcode(try_case_end, 1) -> 107;
-opcode(raise, 2) -> 108;
-opcode(bs_init2, 6) -> 109;
-%%opcode(bs_bits_to_bytes, 3) -> 110;
-opcode(bs_add, 5) -> 111;
-opcode(apply, 1) -> 112;
-opcode(apply_last, 2) -> 113;
-opcode(is_boolean, 2) -> 114;
-opcode(is_function2, 3) -> 115;
-opcode(bs_start_match2, 5) -> 116;
-opcode(bs_get_integer2, 7) -> 117;
-opcode(bs_get_float2, 7) -> 118;
-opcode(bs_get_binary2, 7) -> 119;
-opcode(bs_skip_bits2, 5) -> 120;
-opcode(bs_test_tail2, 3) -> 121;
-opcode(bs_save2, 2) -> 122;
-opcode(bs_restore2, 2) -> 123;
-opcode(gc_bif1, 5) -> 124;
-opcode(gc_bif2, 6) -> 125;
-%%opcode(bs_final2, 2) -> 126;
-%%opcode(bs_bits_to_bytes2, 2) -> 127;
-%%opcode(put_literal, 2) -> 128;
-opcode(is_bitstr, 2) -> 129;
-opcode(bs_context_to_binary, 1) -> 130;
-opcode(bs_test_unit, 3) -> 131;
-opcode(bs_match_string, 4) -> 132;
-opcode(bs_init_writable, 0) -> 133;
-opcode(bs_append, 8) -> 134;
-opcode(bs_private_append, 6) -> 135;
-opcode(trim, 2) -> 136;
-opcode(bs_init_bits, 6) -> 137;
-opcode(bs_get_utf8, 5) -> 138;
-opcode(bs_skip_utf8, 4) -> 139;
-opcode(bs_get_utf16, 5) -> 140;
-opcode(bs_skip_utf16, 4) -> 141;
-opcode(bs_get_utf32, 5) -> 142;
-opcode(bs_skip_utf32, 4) -> 143;
-opcode(bs_utf8_size, 3) -> 144;
-opcode(bs_put_utf8, 3) -> 145;
-opcode(bs_utf16_size, 3) -> 146;
-opcode(bs_put_utf16, 3) -> 147;
-opcode(bs_put_utf32, 3) -> 148;
-opcode(on_load, 0) -> 149;
-opcode(recv_mark, 1) -> 150;
-opcode(recv_set, 1) -> 151;
-opcode(gc_bif3, 7) -> 152;
-opcode(line, 1) -> 153;
-opcode(Name, Arity) -> erlang:error(badarg, [Name,Arity]).
-
--spec opname(1..153) -> {atom(),0..8}.
-opname(1) -> {label,1};
-opname(2) -> {func_info,3};
-opname(3) -> {int_code_end,0};
-opname(4) -> {call,2};
-opname(5) -> {call_last,3};
-opname(6) -> {call_only,2};
-opname(7) -> {call_ext,2};
-opname(8) -> {call_ext_last,3};
-opname(9) -> {bif0,2};
-opname(10) -> {bif1,4};
-opname(11) -> {bif2,5};
-opname(12) -> {allocate,2};
-opname(13) -> {allocate_heap,3};
-opname(14) -> {allocate_zero,2};
-opname(15) -> {allocate_heap_zero,3};
-opname(16) -> {test_heap,2};
-opname(17) -> {init,1};
-opname(18) -> {deallocate,1};
-opname(19) -> {return,0};
-opname(20) -> {send,0};
-opname(21) -> {remove_message,0};
-opname(22) -> {timeout,0};
-opname(23) -> {loop_rec,2};
-opname(24) -> {loop_rec_end,1};
-opname(25) -> {wait,1};
-opname(26) -> {wait_timeout,2};
-opname(27) -> {m_plus,4};
-opname(28) -> {m_minus,4};
-opname(29) -> {m_times,4};
-opname(30) -> {m_div,4};
-opname(31) -> {int_div,4};
-opname(32) -> {int_rem,4};
-opname(33) -> {int_band,4};
-opname(34) -> {int_bor,4};
-opname(35) -> {int_bxor,4};
-opname(36) -> {int_bsl,4};
-opname(37) -> {int_bsr,4};
-opname(38) -> {int_bnot,3};
-opname(39) -> {is_lt,3};
-opname(40) -> {is_ge,3};
-opname(41) -> {is_eq,3};
-opname(42) -> {is_ne,3};
-opname(43) -> {is_eq_exact,3};
-opname(44) -> {is_ne_exact,3};
-opname(45) -> {is_integer,2};
-opname(46) -> {is_float,2};
-opname(47) -> {is_number,2};
-opname(48) -> {is_atom,2};
-opname(49) -> {is_pid,2};
-opname(50) -> {is_reference,2};
-opname(51) -> {is_port,2};
-opname(52) -> {is_nil,2};
-opname(53) -> {is_binary,2};
-opname(54) -> {is_constant,2};
-opname(55) -> {is_list,2};
-opname(56) -> {is_nonempty_list,2};
-opname(57) -> {is_tuple,2};
-opname(58) -> {test_arity,3};
-opname(59) -> {select_val,3};
-opname(60) -> {select_tuple_arity,3};
-opname(61) -> {jump,1};
-opname(62) -> {'catch',2};
-opname(63) -> {catch_end,1};
-opname(64) -> {move,2};
-opname(65) -> {get_list,3};
-opname(66) -> {get_tuple_element,3};
-opname(67) -> {set_tuple_element,3};
-opname(68) -> {put_string,3};
-opname(69) -> {put_list,3};
-opname(70) -> {put_tuple,2};
-opname(71) -> {put,1};
-opname(72) -> {badmatch,1};
-opname(73) -> {if_end,0};
-opname(74) -> {case_end,1};
-opname(75) -> {call_fun,1};
-opname(76) -> {make_fun,3};
-opname(77) -> {is_function,2};
-opname(78) -> {call_ext_only,2};
-opname(79) -> {bs_start_match,2};
-opname(80) -> {bs_get_integer,5};
-opname(81) -> {bs_get_float,5};
-opname(82) -> {bs_get_binary,5};
-opname(83) -> {bs_skip_bits,4};
-opname(84) -> {bs_test_tail,2};
-opname(85) -> {bs_save,1};
-opname(86) -> {bs_restore,1};
-opname(87) -> {bs_init,2};
-opname(88) -> {bs_final,2};
-opname(89) -> {bs_put_integer,5};
-opname(90) -> {bs_put_binary,5};
-opname(91) -> {bs_put_float,5};
-opname(92) -> {bs_put_string,2};
-opname(93) -> {bs_need_buf,1};
-opname(94) -> {fclearerror,0};
-opname(95) -> {fcheckerror,1};
-opname(96) -> {fmove,2};
-opname(97) -> {fconv,2};
-opname(98) -> {fadd,4};
-opname(99) -> {fsub,4};
-opname(100) -> {fmul,4};
-opname(101) -> {fdiv,4};
-opname(102) -> {fnegate,3};
-opname(103) -> {make_fun2,1};
-opname(104) -> {'try',2};
-opname(105) -> {try_end,1};
-opname(106) -> {try_case,1};
-opname(107) -> {try_case_end,1};
-opname(108) -> {raise,2};
-opname(109) -> {bs_init2,6};
-opname(110) -> {bs_bits_to_bytes,3};
-opname(111) -> {bs_add,5};
-opname(112) -> {apply,1};
-opname(113) -> {apply_last,2};
-opname(114) -> {is_boolean,2};
-opname(115) -> {is_function2,3};
-opname(116) -> {bs_start_match2,5};
-opname(117) -> {bs_get_integer2,7};
-opname(118) -> {bs_get_float2,7};
-opname(119) -> {bs_get_binary2,7};
-opname(120) -> {bs_skip_bits2,5};
-opname(121) -> {bs_test_tail2,3};
-opname(122) -> {bs_save2,2};
-opname(123) -> {bs_restore2,2};
-opname(124) -> {gc_bif1,5};
-opname(125) -> {gc_bif2,6};
-opname(126) -> {bs_final2,2};
-opname(127) -> {bs_bits_to_bytes2,2};
-opname(128) -> {put_literal,2};
-opname(129) -> {is_bitstr,2};
-opname(130) -> {bs_context_to_binary,1};
-opname(131) -> {bs_test_unit,3};
-opname(132) -> {bs_match_string,4};
-opname(133) -> {bs_init_writable,0};
-opname(134) -> {bs_append,8};
-opname(135) -> {bs_private_append,6};
-opname(136) -> {trim,2};
-opname(137) -> {bs_init_bits,6};
-opname(138) -> {bs_get_utf8,5};
-opname(139) -> {bs_skip_utf8,4};
-opname(140) -> {bs_get_utf16,5};
-opname(141) -> {bs_skip_utf16,4};
-opname(142) -> {bs_get_utf32,5};
-opname(143) -> {bs_skip_utf32,4};
-opname(144) -> {bs_utf8_size,3};
-opname(145) -> {bs_put_utf8,3};
-opname(146) -> {bs_utf16_size,3};
-opname(147) -> {bs_put_utf16,3};
-opname(148) -> {bs_put_utf32,3};
-opname(149) -> {on_load,0};
-opname(150) -> {recv_mark,1};
-opname(151) -> {recv_set,1};
-opname(152) -> {gc_bif3,7};
-opname(153) -> {line,1};
-opname(Number) -> erlang:error(badarg, [Number]).
View
12 bootstrap/lib/compiler/egen/beam_opcodes.hrl
@@ -1,12 +0,0 @@
-%% Warning: Do not edit this file.
-%% Auto-generated by 'beam_makeops'.
-
--define(tag_u, 0).
--define(tag_i, 1).
--define(tag_a, 2).
--define(tag_x, 3).
--define(tag_y, 4).
--define(tag_f, 5).
--define(tag_h, 6).
--define(tag_z, 7).
-
View
5,426 bootstrap/lib/compiler/egen/core_parse.erl
0 additions, 5,426 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
120 bootstrap/lib/kernel/ebin/kernel.app
@@ -1,120 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%% This is an -*- erlang -*- file.
-%%
-{application, kernel,
- [
- {description, "ERTS CXC 138 10"},
- {vsn, "2.15"},
- {modules, [application,
- application_controller,
- application_master,
- application_starter,
- auth,
- code,
- packages,
- code_server,
- dist_util,
- erl_boot_server,
- erl_distribution,
- erl_reply,
- error_handler,
- error_logger,
- file,
- file_server,
- file_io_server,
- global,
- global_group,
- global_search,
- group,
- heart,
- hipe_unified_loader,
- inet6_tcp,
- inet6_tcp_dist,
- inet6_udp,
- inet6_sctp,
- inet_config,
- inet_hosts,
- inet_gethost_native,
- inet_tcp_dist,
- kernel,
- kernel_config,
- net,
- net_adm,
- net_kernel,
- os,
- ram_file,
- rpc,
- user,
- user_drv,
- user_sup,
- disk_log,
- disk_log_1,
- disk_log_server,
- disk_log_sup,
- dist_ac,
- erl_ddll,
- erl_epmd,
- erts_debug,
- gen_tcp,
- gen_udp,
- gen_sctp,
- inet,
- inet_db,
- inet_dns,
- inet_parse,
- inet_res,
- inet_tcp,
- inet_udp,
- inet_sctp,
- pg2,
- seq_trace,
- standard_error,
- wrap_log_reader]},
- {registered, [application_controller,
- erl_reply,
- auth,
- boot_server,
- code_server,
- disk_log_server,
- disk_log_sup,
- erl_prim_loader,
- error_logger,
- file_server_2,
- fixtable_server,
- global_group,
- global_name_server,
- heart,
- init,
- kernel_config,
- kernel_sup,
- net_kernel,
- net_sup,
- rex,
- user,
- os_server,
- ddll_server,
- erl_epmd,
- inet_db,
- pg2]},
- {applications, []},
- {env, [{error_logger, tty}]},
- {mod, {kernel, []}}
- ]
-}.
View
1 bootstrap/lib/kernel/ebin/kernel.appup
@@ -1 +0,0 @@
-{"2.15",[],[]}.
View
0 bootstrap/lib/kernel/egen/.gitignore
No changes.
View
66 bootstrap/lib/orber/include/Makefile
@@ -1,66 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-EXTERNAL_HRL_FILES= ../include/corba.hrl \
- ../include/ifr_types.hrl \
- ../include/orber_pi.hrl
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt clean docs:
-
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
- $(INSTALL_DIR) $(RELSYSDIR)/include
- $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-
-
-release_docs_spec:
-
-
View
148 bootstrap/lib/orber/include/corba.hrl
@@ -1,148 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------
-%% File: corba.hrl
-%%
-%% Description:
-%% Standard header file for the Orber Erlang CORBA environment
-%%
-%%-----------------------------------------------------------------
--ifndef(corba_hrl).
--define(corba_hrl, true).
-
-%%
-%% Implementation repository record (not used and can therefor be changed)
-%%
--record(orb_ImplDef, {node, module, typename, start=start, args=[[]], pid}).
-
-%%
-%% Any record
-%%
--record(any, {typecode, value}).
-
-%%
-%% Any record
-%%
--record(fixed, {digits, scale, value}).
-
-%%
-%% Service context record
-%%
--record('IOP_ServiceContext', {context_id, context_data}).
-
-%%
-%% Exception recod for the resolve initial reference functions
-%%
--record('InvalidName', {'OE_ID'="IDL:omg.org/CORBA/ORB/InvalidName:1.0"}).
-
-%% Orber OMG assigned TAG's
-%% Service Context IDs 0x45524904 - 0x45524907 ("ERI\x04" - "ERI\x07")
-%% Component IDs 0x45524904 - 0x45524907 ("ERI\x04" - "ERI\x07")
-%% ORB type IDs 0x45524904 - 0x45524907 ("ERI\x04" - "ERI\x07")
--define(ORBER_ORB_TYPE_1, 16#45524904).
-%-define(ORBER_ORB_TYPE_2, 16#45524905).
-%-define(ORBER_ORB_TYPE_3, 16#45524906).
-%-define(ORBER_ORB_TYPE_4, 16#45524907).
-
-%-define(ORBER_COMPONENT_1, 16#45524904).
-%-define(ORBER_COMPONENT_2, 16#45524905).
-%-define(ORBER_COMPONENT_3, 16#45524906).
-%-define(ORBER_COMPONENT_4, 16#45524907).
-
--define(ORBER_GENERIC_CTX_ID, 16#45524904).
-%-define(ORBER_SERVICE_CTX_2, 16#45524905).
-%-define(ORBER_SERVICE_CTX_3, 16#45524906).
-%-define(ORBER_SERVICE_CTX_4, 16#45524907).
-
-%%
-%% System exceptions
-%%
-
-%% VMCID
-%% VMCID base assigned to OMG
--define(CORBA_OMGVMCID, 16#4f4d0000).
-
-%% Orber's VMCID base - "ER\x00\x00" - "ER\x0f\xff".
-%% Range 16#45520000 -> 16#45520fff
--define(ORBER_VMCID, 16#45520000).
-
-%% Some other Vendors VMCID bases.
--define(IONA_VMCID_1, 16#4f4f0000).
--define(IONA_VMCID_2, 16#49540000).
--define(SUN_VMCID, 16#53550000).
--define(BORLAND_VMCID, 16#56420000).
--define(TAO_VMCID, 16#54410000).
--define(PRISMTECH_VMCID,16#50540000).
-
--define(ex_body, {'OE_ID'="", minor=?ORBER_VMCID, completion_status}).
-
--record('UNKNOWN', ?ex_body).
--record('BAD_PARAM', ?ex_body).
--record('NO_MEMORY', ?ex_body).
--record('IMP_LIMIT', ?ex_body).
--record('COMM_FAILURE', ?ex_body).
--record('INV_OBJREF', ?ex_body).
--record('NO_PERMISSION', ?ex_body).
--record('INTERNAL', ?ex_body).
--record('MARSHAL', ?ex_body).
--record('INITIALIZE', ?ex_body).
--record('NO_IMPLEMENT', ?ex_body).
--record('BAD_TYPECODE', ?ex_body).
--record('BAD_OPERATION', ?ex_body).
--record('NO_RESOURCES', ?ex_body).
--record('NO_RESPONSE', ?ex_body).
--record('PERSIST_STORE', ?ex_body).
--record('BAD_INV_ORDER', ?ex_body).
--record('TRANSIENT', ?ex_body).
--record('FREE_MEM', ?ex_body).
--record('INV_IDENT', ?ex_body).
--record('INV_FLAG', ?ex_body).
--record('INTF_REPOS', ?ex_body).
--record('BAD_CONTEXT', ?ex_body).
--record('OBJ_ADAPTER', ?ex_body).
--record('DATA_CONVERSION', ?ex_body).
--record('OBJECT_NOT_EXIST', ?ex_body).
--record('TRANSACTION_REQUIRED', ?ex_body).
--record('TRANSACTION_ROLLEDBACK', ?ex_body).
--record('INVALID_TRANSACTION', ?ex_body).
--record('INV_POLICY', ?ex_body).
--record('CODESET_INCOMPATIBLE', ?ex_body).
--record('REBIND', ?ex_body).
--record('TIMEOUT', ?ex_body).
--record('TRANSACTION_UNAVAILABLE', ?ex_body).
--record('TRANSACTION_MODE', ?ex_body).
--record('BAD_QOS', ?ex_body).
-
-%% Defines for the enum exception_type (is also used for reply_status)
--define(NO_EXCEPTION, 'no_exception').
--define(USER_EXCEPTION, 'user_exception').
--define(SYSTEM_EXCEPTION, 'system_exception').
-
-%% Defines for the enum completion_status.
--define(COMPLETED_YES, 'COMPLETED_YES').
--define(COMPLETED_NO, 'COMPLETED_NO').
--define(COMPLETED_MAYBE, 'COMPLETED_MAYBE').
-
-
--undef(ex_body).
-
-
--endif.
View
72 bootstrap/lib/orber/include/ifr_types.hrl
@@ -1,72 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File : ifr_types.hrl
-%% Purpose : Record definitions for structs used in the interface repository
-%%----------------------------------------------------------------------
-
-
-%%%----------------------------------------------------------------------
-%%% *********************************************************************
-%%% * *
-%%% * PLEASE NOTE *
-%%% * *
-%%% * If a record is removed or added in this file, select/2 in *
-%%% * orber_ifr.erl _MUST_ be updated accordingly. *
-%%% * *
-%%% *********************************************************************
-%%%----------------------------------------------------------------------
-
--record(contained_description, {kind, value}).
-
--record(structmember, {name, type, type_def}).
-
--record(unionmember, {name, label, type, type_def}).
-
--record(container_description, {contained_object, kind, value}).
-
--record(moduledescription, {name, id, defined_in, version}).
-
--record(constantdescription, {name, id, defined_in, version, type, value}).
-
--record(typedescription, {name, id, defined_in, version, type}).
-
--define(make_typedescription(Obj,Object_type),
- #typedescription{name = Obj#Object_type.name,
- id = Obj#Object_type.id,
- defined_in = Obj#Object_type.defined_in,
- version = Obj#Object_type.version,
- type = Obj#Object_type.type}).
-
--record(exceptiondescription, {name, id, defined_in, version, type}).
-
--record(attributedescription, {name, id, defined_in, version, type, mode}).
-
--record(parameterdescription, {name, type, type_def, mode}).
-
--record(operationdescription, {name, id, defined_in, version, result, mode,
- contexts, parameters, exceptions}).
-
--record(fullinterfacedescription, {name, id, defined_in, version, operations,
- attributes, base_interfaces, type}).
-
--record(interfacedescription, {name, id, defined_in, version,
- base_interfaces}).
View
76 bootstrap/lib/orber/include/orber_pi.hrl
@@ -1,76 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File : orber_pi.hrl
-%% Purpose :
-%%----------------------------------------------------------------------
-
-%%=============== CONSTANTS ==================================
-%%-------- PortableInterceptor::Interceptor (local) ----------
-%% Reply Status
--define('PortableInterceptor_SUCCESSFUL', 0).
--define('PortableInterceptor_SYSTEM_EXCEPTION', 1).
--define('PortableInterceptor_USER_EXCEPTION', 2).
--define('PortableInterceptor_LOCATION_FORWARD', 3).
--define('PortableInterceptor_LOCATION_FORWARD_PERMANENT', 4).
--define('PortableInterceptor_TRANSPORT_RETRY', 5).
-
-
-%%=============== EXCEPTIONS =================================
-%%-------- PortableInterceptor::Interceptor (local) ----------
-%% forward eq. CORBA::Object, premanent eq. boolean
--record('PortableInterceptor_ForwardRequest', {'OE_ID'="local", forward, permanent}).
--record('PortableInterceptor_InvalidSlot', {'OE_ID'="local"}).
-
-%%--------------- IOP_N::Codec (local) -----------------------
--record('IOP_N_Codec_InvalidTypeForEncoding', {'OE_ID'="local"}).
--record('IOP_N_Codec_FormatMismatch', {'OE_ID'="local"}).
--record('IOP_N_Codec_TypeMismatch', {'OE_ID'="local"}).
-
-%%--------------- IOP_N (Module level) -----------------------
--define('IOP_N_ENCODING_CDR_ENCAPS', 0).
-
-%%--------------- IOP_N::CodecFactory (Module level) ---------
--record('IOP_N_CodecFactory_UnknownEncoding', {'OE_ID'="local"}).
-
-%%--------------- IOP_N::ORBInitInfo (Module level) ----------
-%% name eq. string()
--record('PortableInterceptor_ORBInitInfo_DuplicateName', {'OE_ID'="local", name}).
--record('PortableInterceptor_ORBInitInfo_InvalidName', {'OE_ID'="local"}).
-
-
-%%=============== DATA STRUCTURES ============================
-%%--------------- IOP_N (Module level) -----------------------
--record('IOP_N_Encoding',
- {format, %% Currently only 'IOP_N_ENCODING_CDR_ENCAPS' allowed.
- major_version, %% 1 only
- minor_version}). %% 0,1 or 2
-
-
-%%--------------- Dynamic (Module level) ---------------------
-%% argument eq. #any{},
-%% mode eq. CORBA::ParameterMode - PARAM_IN, PARAM_OUT, PARAM_INOUT.
--record('Dynamic_Parameter',
- {argument,
- mode}).
-
-%%--------------- END OF MODULE ------------------------------
-
View
106 bootstrap/lib/stdlib/ebin/stdlib.app
@@ -1,106 +0,0 @@
-%% This is an -*- erlang -*- file.
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-{application, stdlib,
- [{description, "ERTS CXC 138 10"},
- {vsn, "1.18"},
- {modules, [array,
- base64,
- beam_lib,
- binary,
- c,
- calendar,
- dets,
- dets_server,
- dets_sup,
- dets_utils,
- dets_v8,
- dets_v9,
- dict,
- digraph,
- digraph_utils,
- edlin,
- edlin_expand,
- epp,
- eval_bits,
- erl_bits,
- erl_compile,
- erl_eval,
- erl_expand_records,
- erl_internal,
- erl_lint,
- erl_parse,
- erl_posix_msg,
- erl_pp,
- erl_scan,
- erl_tar,
- error_logger_file_h,
- error_logger_tty_h,
- escript,
- ets,
- file_sorter,
- filelib,
- filename,
- gb_trees,
- gb_sets,
- gen,
- gen_event,
- gen_fsm,
- gen_server,
- io,
- io_lib,
- io_lib_format,
- io_lib_fread,
- io_lib_pretty,
- lib,
- lists,
- log_mf_h,
- math,
- ms_transform,
- orddict,
- ordsets,
- otp_internal,
- pg,
- pool,
- proc_lib,
- proplists,
- qlc,
- qlc_pt,
- queue,
- random,
- re,
- regexp,
- sets,
- shell,
- shell_default,
- slave,
- sofs,
- string,
- supervisor,
- supervisor_bridge,
- sys,
- timer,
- unicode,
- win32reg,
- zip]},
- {registered,[timer_server,rsh_starter,take_over_monitor,pool_master,
- dets]},
- {applications, [kernel]},
- {env, []}]}.
-
View
1 bootstrap/lib/stdlib/ebin/stdlib.appup
@@ -1 +0,0 @@
-{"1.18",[],[]}.
View
9,680 bootstrap/lib/stdlib/egen/erl_parse.erl
0 additions, 9,680 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
12 lib/Makefile
@@ -70,19 +70,15 @@ endif
ifdef BOOTSTRAP
SUB_DIRECTORIES = \
- kernel stdlib compiler orber/include
+ kernel stdlib compiler
else
ifdef SECONDARY_BOOTSTRAP
SUB_DIRECTORIES = hipe parsetools asn1/src
else
ifdef TERTIARY_BOOTSTRAP
- SUB_DIRECTORIES = snmp
- else
- ifdef FOURTH_BOOTSTRAP
- SUB_DIRECTORIES = sasl jinterface ic syntax_tools
- else # Not bootstrap build
- SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
- endif
+ SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools
+ else # Not bootstrap build
+ SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
endif
endif
endif
View
66 lib/orber/include/Makefile
@@ -1,66 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-EXTERNAL_HRL_FILES= ../include/corba.hrl \
- ../include/ifr_types.hrl \
- ../include/orber_pi.hrl
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt clean docs:
-
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
- $(INSTALL_DIR) $(RELSYSDIR)/include
- $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-
-
-release_docs_spec:
-
-
View
60 lib/stdlib/test/tar_SUITE.erl
@@ -283,17 +283,16 @@ long_names(doc) ->
long_names(Config) when is_list(Config) ->
?line DataDir = ?config(data_dir, Config),
?line Long = filename:join(DataDir, "long_names.tar"),
+ run_in_short_tempdir(Config,
+ fun() -> do_long_names(Long) end).
+do_long_names(Long) ->
%% Try table/2 and extract/2.
?line case erl_tar:table(Long, [verbose]) of
{ok,List} when is_list(List) ->
?line io:format("~p\n", [List])
end,
-
- %% To avoid getting too long paths for Windows to handle, extract into
- %% the current directory (which is the test_server directory). Its path
- %% is quite a bit shorter than the path to priv_dir.
?line {ok,Cwd} = file:get_cwd(),
?line ok = erl_tar:extract(Long),
?line Base = filename:join([Cwd, "original_software", "written_by",
@@ -312,17 +311,16 @@ long_names(Config) when is_list(Config) ->
?line "Here"++_ = binary_to_list(First),
?line "And"++_ = binary_to_list(Second),
- %% Clean up.
- ?line delete_files([filename:join(Cwd, "original_software"),EmptyDir]),
-
ok.
create_long_names(doc) ->
["Creates a tar file from a deep directory structure (filenames are ",
"longer than 100 characters)."];
create_long_names(Config) when is_list(Config) ->
- ?line PrivDir = ?config(priv_dir, Config),
- ?line ok = file:set_cwd(PrivDir),
+ run_in_short_tempdir(Config, fun create_long_names/0).
+
+create_long_names() ->
+ ?line {ok,Dir} = file:get_cwd(),
Dirs = ["aslfjkshjkhliuf",
"asdhjfehnbfsky",
"sahajfskdfhsz",
@@ -334,7 +332,7 @@ create_long_names(Config) when is_list(Config) ->
?line AFile = filename:join(DeepDir, "a_file"),
?line Hello = "hello, world\n",
?line ok = file:write_file(AFile, Hello),
- ?line TarName = filename:join(PrivDir, "my_tar_with_long_names.tar"),
+ ?line TarName = filename:join(Dir, "my_tar_with_long_names.tar"),
?line ok = erl_tar:create(TarName, [AFile]),
%% Print contents.
@@ -347,9 +345,6 @@ create_long_names(Config) when is_list(Config) ->
?line {ok, Bin} = file:read_file(filename:join(ExtractDir, AFile)),
?line Hello = binary_to_list(Bin),
- %% Clean up.
- ?line delete_files([ExtractDir,TarName,hd(Dirs)]),
-
ok.
make_dirs([Dir|Rest], []) ->
@@ -734,3 +729,42 @@ delete_files([Item|Rest]) ->
end,
delete_files(Rest).
+%% Move to a temporary directory with as short name as possible and
+%% execute Fun. Remove the directory and any files in it afterwards.
+%% This is necessary because pathnames on Windows may be limited to
+%% 260 characters.
+run_in_short_tempdir(Config, Fun) ->
+ {ok,Cwd} = file:get_cwd(),
+ PrivDir0 = ?config(priv_dir, Config),
+
+ %% Normalize name to make sure that there is no slash at the end.
+ PrivDir = filename:absname(PrivDir0),
+
+ %% We need a base directory with a much shorter pathname than
+ %% priv_dir. We KNOW that priv_dir is located four levels below
+ %% the directory that common_test puts the ct_run.* directories
+ %% in. That fact is not documented, but an usually reliable source
+ %% assured me that the directory structure is unlikely to change
+ %% in future versions of common_test because of backward
+ %% compatibility (tools developed by users of common_test depend
+ %% on the current directory layout).
+ Base = lists:foldl(fun(_, D) ->
+ filename:dirname(D)
+ end, PrivDir, [1,2,3,4]),
+
+ Dir = make_temp_dir(Base, 0),
+ ok = file:set_cwd(Dir),
+ io:format("Running test in ~s\n", [Dir]),
+ try
+ Fun()
+ after
+ file:set_cwd(Cwd),
+ delete_files([Dir])
+ end.
+
+make_temp_dir(Base, I) ->
+ Name = filename:join(Base, integer_to_list(I, 36)),
+ case file:make_dir(Name) of
+ ok -> Name;
+ {error,eexist} -> make_temp_dir(Base, I+1)
+ end.
View
11 otp_build
@@ -878,8 +878,10 @@ do_primary_git ()
git add -A bootstrap/lib/kernel \
bootstrap/lib/stdlib \
bootstrap/lib/compiler \
- bootstrap/lib/orber/include \
bootstrap/bin
+ find bootstrap -name egen -o -name '*.script' -o \
+ -name '*.app' -o -name '*.appup' |
+ xargs git reset HEAD
git commit --no-verify -m 'Update primary bootstrap'
}
@@ -1001,24 +1003,17 @@ do_copy_primary_bootstrap ()
test -d $bootstrap/lib/kernel/ebin || mkdir -p $bootstrap/lib/kernel/ebin
test -d $bootstrap/lib/kernel/include || mkdir -p $bootstrap/lib/kernel/include
cp -f $lib_src/kernel/ebin/*.beam $bootstrap/lib/kernel/ebin
- cp -f $lib_src/kernel/ebin/*.app* $bootstrap/lib/kernel/ebin
cp -f $lib_src/kernel/include/*.hrl $bootstrap/lib/kernel/include
# stdlib
test -d $bootstrap/lib/stdlib/ebin || mkdir -p $bootstrap/lib/stdlib/ebin
test -d $bootstrap/lib/stdlib/include || mkdir -p $bootstrap/lib/stdlib/include
cp -f $lib_src/stdlib/ebin/*.beam $bootstrap/lib/stdlib/ebin
- cp -f $lib_src/stdlib/ebin/*.app* $bootstrap/lib/stdlib/ebin
cp -f $lib_src/stdlib/include/*.hrl $bootstrap/lib/stdlib/include
# compiler
test -d $bootstrap/lib/compiler/ebin || mkdir -p $bootstrap/lib/compiler/ebin
cp -f $lib_src/compiler/ebin/*.beam $bootstrap/lib/compiler/ebin
- cp -f $lib_src/compiler/ebin/*.app* $bootstrap/lib/compiler/ebin
-
- # orber include
- test -d $bootstrap/lib/orber/include || mkdir -p $bootstrap/lib/orber/include
- cp -f $lib_src/orber/include/* $bootstrap/lib/orber/include
# bootstrap bin
if [ $bootstrap_src_top != $ERL_TOP ]; then

0 comments on commit 70fa7fa

Please sign in to comment.