Changeset 948 for trunk/base

Timestamp:

Oct 5, 2002, 1:17:09 AM (22 years ago)

Author:

kevin

Message:

Change make.* options to build.* since they pertain to the build target, and
make isn't always the command that's used.

Location:

trunk/base

Files:

• doc/portfile.7 (modified) (6 diffs)
• src/port1.0/portbuild.tcl (modified) (3 diffs)
• src/port1.0/portinstall.tcl (modified) (2 diffs)

trunk/base/doc/portfile.7

@@ -527 +527 @@
 Execute necessary build commands
 .Bl -tag -width lc
-.It Ic make.cmd
+.It Ic build.cmd
 Make command to run relative to ${worksrcdir}
 .br
@@ -536 +536 @@
 .br
 .Sy Example:
-.Dl make.cmd    pbxbuild
-
-.It Ic make.type
+.Dl build.cmd   pbxbuild
+
+.It Ic build.type
 Type of make required, either 'gnu' or 'bsd'
-Sets make.cmd to either 'gnumake' or 'bsdmake' accordingly
+Sets build.cmd to either 'gnumake' or 'bsdmake' accordingly
 .br
 .Sy Type:
@@ -548 +548 @@
 .br
 .Sy Example:
-.Dl make.type   gnu
-
-.It Ic make.pre_args
-Arguments to pass to ${make.cmd} before ${make.args}
-.br
-.Sy Type:
-.Em read-only
-.Sy Default:
-.Em ${make.target.current}
-
-
-.It Ic make.args
-Arguments to pass to ${make.cmd}
-.br
-.Sy Type:
-.Em optional
-.br
-.Sy Example:
-.Dl make.args   -DNOWARN
-
-
-.It Ic make.target.all
+.Dl build.type  gnu
+
+.It Ic build.pre_args
+Arguments to pass to ${build.cmd} before ${build.args}
+.br
+.Sy Type:
+.Em read-only
+.Sy Default:
+.Em ${build.target.current}
+
+
+.It Ic build.args
+Arguments to pass to ${build.cmd}
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Example:
+.Dl build.args  -DNOWARN
+
+
+.It Ic build.target.all
 Target to pass to make for building everything
 .br
@@ -578 +578 @@
 .br
 .Sy Example:
-.Dl make.target.all all-src
+.Dl build.target.all all-src
 
 .El
@@ -586 +586 @@
 .Bl -tag -width lc
 
-.It Ic make.target.install
-Install target to pass to ${make.cmd}
+.It Ic build.target.install
+Install target to pass to ${build.cmd}
 .br
 .Sy Type:
@@ -595 +595 @@
 .br
 .Sy Example:
-.Dl make.target.install install-src
+.Dl build.target.install        install-src
 
 .El

trunk/base/src/port1.0/portbuild.tcl

@@ -39 +39 @@
 
 # define options
-options make.target.all
-commands make
+options build.target.all
+commands build
 # defaults
-default make.dir {${workpath}/${worksrcdir}}
-default make.cmd {[build_getmaketype]}
-default make.pre_args {${make.target.current}}
-default make.target.all all
+default build.dir {${workpath}/${worksrcdir}}
+default build.cmd {[build_getmaketype]}
+default build.pre_args {${build.target.current}}
+default build.target.all all
 
 set UI_PREFIX "---> "
 
 proc build_getmaketype {args} {
-    global make.type make.cmd os.name
+    global build.type build.cmd os.name
 
-    if ![info exists make.type] {
+    if ![info exists build.type] {
         return make
     }
-    switch -exact -- ${make.type} {
+    switch -exact -- ${build.type} {
         bsd {
             if {${os.name} == "darwin"} {
@@ -74 +74 @@
         }
         default {
-            ui_warning "Unknown make.type ${make.type}, using 'gnumake'"
+            ui_warning "Unknown build.type ${build.type}, using 'gnumake'"
             return gnumake
         }
@@ -81 +81 @@
 
 proc build_main {args} {
-    global portname portpath workdir prefix make.type make.cmd make.env make.target.all make.target.current UI_PREFIX worksrcdir
+    global portname portpath workdir prefix build.type build.cmd build.env build.target.all build.target.current UI_PREFIX worksrcdir
 
-    ui_msg "$UI_PREFIX Building $portname with target ${make.target.all}"
-    set make.target.current ${make.target.all}
+    ui_msg "$UI_PREFIX Building $portname with target ${build.target.all}"
+    set build.target.current ${build.target.all}
     system "[command make]"
     return 0

trunk/base/src/port1.0/portinstall.tcl

@@ -39 +39 @@
 
 # define options
-options make.target.install
+options build.target.install
 # Set defaults
-default make.target.install install
+default build.target.current install
 
 set UI_PREFIX "---> "
 
 proc install_main {args} {
-    global portname portversion portpath categories description depends_run contents pkg_install pkg_deinstall workdir worksrcdir prefix make.type make.cmd make.target.install UI_PREFIX make.target.current
+    global portname portversion portpath categories description depends_run contents pkg_install pkg_deinstall workdir worksrcdir prefix build.type build.cmd build.target.install UI_PREFIX build.target.current
 
     if ![file exists $prefix] {
@@ -55 +55 @@
         }
     }
-    ui_msg "$UI_PREFIX Installing $portname with target ${make.target.install}"
-    set make.target.current ${make.target.install}
+    ui_msg "$UI_PREFIX Installing $portname with target ${build.target.install}"
+    set build.target.current ${build.target.install}
     if [catch {system "[command make]"}] {
         ui_error "Installation failed."