remove command line flag deprecations and docs

JuliaLang · Sep 11, 2015 · 105312f · 105312f
1 parent 7deea8f
commit 105312f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -174,19 +174,19 @@ BASE_SRCS := $(wildcard base/*.jl base/*/*.jl base/*/*/*.jl)
 
 $(build_private_libdir)/inference0.ji: $(CORE_SRCS) | $(build_private_libdir)
 	@$(call PRINT_JULIA, cd base && \
-	$(call spawn,$(JULIA_EXECUTABLE)) -C $(JULIA_CPU_TARGET) --output-ji $(call cygpath_w,$@) -f \
+	$(call spawn,$(JULIA_EXECUTABLE)) -C $(JULIA_CPU_TARGET) --output-ji $(call cygpath_w,$@) --startup-file=no \
 		coreimg.jl)
 
 $(build_private_libdir)/inference.ji: $(build_private_libdir)/inference0.ji
 	@$(call PRINT_JULIA, cd base && \
-	$(call spawn,$(JULIA_EXECUTABLE)) -C $(JULIA_CPU_TARGET) --output-ji $(call cygpath_w,$@) -f \
+	$(call spawn,$(JULIA_EXECUTABLE)) -C $(JULIA_CPU_TARGET) --output-ji $(call cygpath_w,$@) --startup-file=no \
 		-J $(call cygpath_w,$<) coreimg.jl)
 
 COMMA:=,
 define sysimg_builder
 $$(build_private_libdir)/sys$1.o: $$(build_private_libdir)/inference.ji VERSION $$(BASE_SRCS)
 	@$$(call PRINT_JULIA, cd base && \
-	$$(call spawn,$2) -C $$(JULIA_CPU_TARGET) --output-o $$(call cygpath_w,$$@) $$(JULIA_SYSIMG_BUILD_FLAGS) -f \
+	$$(call spawn,$2) -C $$(JULIA_CPU_TARGET) --output-o $$(call cygpath_w,$$@) $$(JULIA_SYSIMG_BUILD_FLAGS) --startup-file=no \
 		-J $$(call cygpath_w,$$<) sysimg.jl \
 		|| { echo '*** This error is usually fixed by running `make clean`. If the error persists$$(COMMA) try `make cleanall`. ***' && false; } )
 .SECONDARY: $(build_private_libdir)/sys$1.o

diff --git a/doc/manual/getting-started.rst b/doc/manual/getting-started.rst
@@ -114,13 +114,10 @@ those available for the ``perl`` and ``ruby`` programs::
      --precompiled={yes|no}    Use precompiled code from system image if available
      -H, --home <dir>          Set location of julia executable
      --startup-file={yes|no}   Load ~/.juliarc.jl
-     -f, --no-startup          Don't load ~/.juliarc (deprecated, use --startup-file=no)
-     -F                        Load ~/.juliarc (deprecated, use --startup-file=yes)
      --handle-signals={yes|no} Enable or disable Julia's default signal handlers
 
      -e, --eval <expr>         Evaluate <expr>
      -E, --print <expr>        Evaluate and show <expr>
-     -P, --post-boot <expr>    Evaluate <expr>, but don't disable interactive mode (deprecated, use -i -e instead)
      -L, --load <file>         Load <file> immediately on all processors
 
      -p, --procs {N|auto}      Integer value N launches N additional local worker processes
@@ -131,7 +128,6 @@ those available for the ``perl`` and ``ruby`` programs::
      -q, --quiet               Quiet startup (no banner)
      --color={yes|no}          Enable or disable color text
      --history-file={yes|no}   Load or save history
-     --no-history-file         Don't load history file (deprecated, use --history-file=no)
 
      --compile={yes|no|all}    Enable or disable compiler, or request exhaustive compilation
      -C, --cpu-target <target> Limit usage of cpu features up to <target>

diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
@@ -34,13 +34,10 @@ let exename = `$(joinpath(JULIA_HOME, Base.julia_exename())) --precompiled=yes`
     @test !success(`$exename -E`)
     @test !success(`$exename --print`)
 
-    # --post-boot
-    @test  success(`$exename -P "exit(0)"`)
-    @test !success(`$exename -P "exit(1)"`)
-    @test  success(`$exename --post-boot="exit(0)"`)
-    @test !success(`$exename --post-boot="exit(1)"`)
-    @test !success(`$exename -P`)
-    @test !success(`$exename --post-boot`)
+    # post boot
+    @test  success(`$exename -i -e "exit(0)"`)
+    @test !success(`$exename -i -e "exit(1)"`)
+    @test !success(`$exename -i -e`)
 
     # --load
     let testfile = tempname()

diff --git a/ui/repl.c b/ui/repl.c
@@ -49,14 +49,11 @@ static const char opts[]  =
     " --precompiled={yes|no}    Use precompiled code from system image if available\n"
     " -H, --home <dir>          Set location of julia executable\n"
     " --startup-file={yes|no}   Load ~/.juliarc.jl\n"
-    " -f, --no-startup          Don't load ~/.juliarc (deprecated, use --startup-file=no)\n"
-    " -F                        Load ~/.juliarc (deprecated, use --startup-file=yes)\n"
     " --handle-signals={yes|no} Enable or disable Julia's default signal handlers\n\n"
 
     // actions
     " -e, --eval <expr>         Evaluate <expr>\n"
     " -E, --print <expr>        Evaluate and show <expr>\n"
-    " -P, --post-boot <expr>    Evaluate <expr>, but don't disable interactive mode (deprecated, use -i -e instead)\n"
     " -L, --load <file>         Load <file> immediately on all processors\n\n"
 
     // parallel options
@@ -69,7 +66,6 @@ static const char opts[]  =
     " -q, --quiet               Quiet startup (no banner)\n"
     " --color={yes|no}          Enable or disable color text\n"
     " --history-file={yes|no}   Load or save history\n"
-    " --no-history-file         Don't load history file (deprecated, use --history-file=no)\n\n"
 
     // code generation options
     " --compile={yes|no|all}    Enable or disable compiler, or request exhaustive compilation\n"
@@ -99,7 +95,6 @@ void parse_opts(int *argcp, char ***argvp)
     enum { opt_machinefile = 300,
            opt_color,
            opt_history_file,
-           opt_no_history_file,
            opt_startup_file,
            opt_compile,
            opt_code_coverage,
@@ -128,7 +123,6 @@ void parse_opts(int *argcp, char ***argvp)
         { "home",            required_argument, 0, 'H' },
         { "eval",            required_argument, 0, 'e' },
         { "print",           required_argument, 0, 'E' },
-        { "post-boot",       required_argument, 0, 'P' },
         { "load",            required_argument, 0, 'L' },
         { "sysimage",        required_argument, 0, 'J' },
         { "precompiled",     required_argument, 0, opt_use_precompiled },
@@ -137,9 +131,7 @@ void parse_opts(int *argcp, char ***argvp)
         { "machinefile",     required_argument, 0, opt_machinefile },
         { "color",           required_argument, 0, opt_color },
         { "history-file",    required_argument, 0, opt_history_file },
-        { "no-history-file", no_argument,       0, opt_no_history_file }, // deprecated
         { "startup-file",    required_argument, 0, opt_startup_file },
-        { "no-startup",      no_argument,       0, 'f' },                 // deprecated
         { "compile",         required_argument, 0, opt_compile },
         { "code-coverage",   optional_argument, 0, opt_code_coverage },
         { "track-allocation",optional_argument, 0, opt_track_allocation },
@@ -200,9 +192,6 @@ void parse_opts(int *argcp, char ***argvp)
         case 'E': // print
             jl_options.print = strdup(optarg);
             break;
-        case 'P': // post-boot
-            jl_options.postboot = strdup(optarg);
-            break;
         case 'L': // load
             jl_options.load = strdup(optarg);
             break;
@@ -252,9 +241,6 @@ void parse_opts(int *argcp, char ***argvp)
             else
                 jl_errorf("julia: invalid argument to --history-file={yes|no} (%s)", optarg);
             break;
-        case opt_no_history_file:
-            jl_options.historyfile = JL_OPTIONS_HISTORYFILE_OFF;
-            break;
         case opt_startup_file:
             if (!strcmp(optarg,"yes"))
                 jl_options.startupfile = JL_OPTIONS_STARTUPFILE_ON;
@@ -263,12 +249,6 @@ void parse_opts(int *argcp, char ***argvp)
             else
                 jl_errorf("julia: invalid argument to --startup-file={yes|no} (%s)", optarg);
             break;
-        case 'f':
-            jl_options.startupfile = JL_OPTIONS_STARTUPFILE_OFF;
-            break;
-        case 'F':
-            jl_options.startupfile = JL_OPTIONS_STARTUPFILE_ON;
-            break;
         case opt_compile:
             if (!strcmp(optarg,"yes"))
                 jl_options.compile_enabled = JL_OPTIONS_COMPILE_ON;