Skip to content
Permalink
Browse files

Change make.* options to build.* since they pertain to the build targ…

…et, and

make isn't always the command that's used.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@948 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
Kevin Van Vechten
Kevin Van Vechten committed Oct 5, 2002
1 parent 3d465fb commit b42611c3e3a9b04d2b9900aab285dd4a321a391c
Showing with 34 additions and 34 deletions.
  1. +16 −16 doc/portfile.7
  2. +13 −13 src/port1.0/portbuild.tcl
  3. +5 −5 src/port1.0/portinstall.tcl
@@ -526,7 +526,7 @@ Does nothing
.Ss BUILD OPTIONS
Execute necessary build commands
.Bl -tag -width lc
.It Ic make.cmd
.It Ic build.cmd
Make command to run relative to ${worksrcdir}
.br
.Sy Type:
@@ -535,40 +535,40 @@ Make command to run relative to ${worksrcdir}
.Em make
.br
.Sy Example:
.Dl make.cmd pbxbuild
.Dl build.cmd pbxbuild

.It Ic make.type
.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:
.Em optional
.Sy Default:
.Em bsd
.br
.Sy Example:
.Dl make.type gnu
.Dl build.type gnu

.It Ic make.pre_args
Arguments to pass to ${make.cmd} before ${make.args}
.It Ic build.pre_args
Arguments to pass to ${build.cmd} before ${build.args}
.br
.Sy Type:
.Em read-only
.Sy Default:
.Em ${make.target.current}
.Em ${build.target.current}


.It Ic make.args
Arguments to pass to ${make.cmd}
.It Ic build.args
Arguments to pass to ${build.cmd}
.br
.Sy Type:
.Em optional
.br
.Sy Example:
.Dl make.args -DNOWARN
.Dl build.args -DNOWARN


.It Ic make.target.all
.It Ic build.target.all
Target to pass to make for building everything
.br
.Sy Type:
@@ -577,24 +577,24 @@ Target to pass to make for building everything
.Em all
.br
.Sy Example:
.Dl make.target.all all-src
.Dl build.target.all all-src

.El

.Ss INSTALL OPTIONS
Execute necessary install commands
.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:
.Em optional
.Sy Default:
.Em install
.br
.Sy Example:
.Dl make.target.install install-src
.Dl build.target.install install-src

.El
.Ss REGISTRY OPTIONS
@@ -38,23 +38,23 @@ register com.apple.build requires main fetch extract checksum patch configure
register com.apple.build deplist depends_build depends_lib

# 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"} {
return bsdmake
@@ -73,17 +73,17 @@ proc build_getmaketype {args} {
return pbxbuild
}
default {
ui_warning "Unknown make.type ${make.type}, using 'gnumake'"
ui_warning "Unknown build.type ${build.type}, using 'gnumake'"
return gnumake
}
}
}

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
}
@@ -38,14 +38,14 @@ register com.apple.install requires main fetch extract checksum patch configure
register com.apple.install deplist depends_run depends_lib

# 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] {
ui_msg "Warning: The directory $prefix does not exist, creating it."
@@ -54,8 +54,8 @@ proc install_main {args} {
return -code error "Could not make directory for ${prefix}: $err"
}
}
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."
return -code error "Installation failed."

0 comments on commit b42611c

Please sign in to comment.
You can’t perform that action at this time.