[46446] users/toby/objcports
toby at macports.org
toby at macports.org
Wed Feb 4 18:47:11 PST 2009
Revision: 46446
http://trac.macports.org/changeset/46446
Author: toby at macports.org
Date: 2009-02-04 18:47:11 -0800 (Wed, 04 Feb 2009)
Log Message:
-----------
defaults
Modified Paths:
--------------
users/toby/objcports/MPParser.m
users/toby/objcports/MPPort.m
users/toby/objcports/objcports.xcodeproj/project.pbxproj
Modified: users/toby/objcports/MPParser.m
===================================================================
--- users/toby/objcports/MPParser.m 2009-02-05 02:38:18 UTC (rev 46445)
+++ users/toby/objcports/MPParser.m 2009-02-05 02:47:11 UTC (rev 46446)
@@ -43,8 +43,6 @@
NSLog(@"Tcl_EvalFile(%@): %s", portfile, Tcl_GetStringResult(_interp));
}
- //fprintf(stderr, "%s\n", Tcl_GetString(Tcl_SubstObj(_interp, Tcl_NewStringObj("$prefix/${extract.suffix}", -1), TCL_SUBST_ALL)));
-
Tcl_Release(_interp);
}
@catch (NSException *exception) {
@@ -244,8 +242,8 @@
_default(ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags)
{
assert(flags == TCL_TRACE_READS);
- assert(name2 == NULL);
- Tcl_SetVar(interp, name1, [[(id)clientData default:[NSString stringWithUTF8String:name1]] UTF8String], 0);
+ /* Default values may contain references to other Tcl variables (or tcl command calls?), so perform the substitution. */
+ Tcl_SetVar2Ex(interp, name1, name2, Tcl_SubstObj(interp, Tcl_NewStringObj([[(id)clientData default:[NSString stringWithUTF8String:name1]] UTF8String], -1), TCL_SUBST_ALL), 0);
return NULL;
}
Modified: users/toby/objcports/MPPort.m
===================================================================
--- users/toby/objcports/MPPort.m 2009-02-05 02:38:18 UTC (rev 46445)
+++ users/toby/objcports/MPPort.m 2009-02-05 02:47:11 UTC (rev 46446)
@@ -27,55 +27,167 @@
[_targets addObject:@"build"];
[_targets addObject:@"destroot"];
+ [self addCommand:@"cvs"]; // portfetch.tcl
+ [self addCommand:@"svn"]; // portfetch.tcl
+ [self addCommand:@"extract"]; // portextract.tcl
+ [self addCommand:@"patch"]; // portpatch.tcl
+ [self addCommand:@"configure"]; // portconfigure.tcl
+ [self addCommand:@"autoreconf"]; // portconfigure.tcl
+ [self addCommand:@"automake"]; // portconfigure.tcl
+ [self addCommand:@"autoconf"]; // portconfigure.tcl
+ [self addCommand:@"xmkmf"]; // portconfigure.tcl
+ [self addCommand:@"build"]; // portbuild.tcl
+ [self addCommand:@"parallel_build"]; // portbuild.tcl
+ [self addCommand:@"test"]; // porttest.tcl
+ [self addCommand:@"destroot"]; // portdestroot.tcl
+
_options = [[NSMutableArray alloc] initWithCapacity:0];
- [self addCommand:@"autoconf"];
- [self addCommand:@"configure"];
- [self addCommand:@"extract"];
- [self addCommand:@"patch"];
- [self addCommand:@"fetch"];
- [self addCommand:@"build"];
- [self addCommand:@"destroot"];
- [_options addObject:@"name"];
- [_options addObject:@"version"];
- [_options addObject:@"revision"];
- [_options addObject:@"categories"];
- [_options addObject:@"maintainers"];
- [_options addObject:@"homepage"];
- [_options addObject:@"platforms"];
- [_options addObject:@"use_bzip2"];
+ [_options addObject:@"prefix"]; // portmain.tcl
+ [_options addObject:@"name"]; // portmain.tcl
+ [_options addObject:@"version"]; // portmain.tcl
+ [_options addObject:@"revision"]; // portmain.tcl
+ [_options addObject:@"epoch"]; // portmain.tcl
+ [_options addObject:@"categories"]; // portmain.tcl
+ [_options addObject:@"maintainers"]; // portmain.tcl
+ [_options addObject:@"long_description"]; // portmain.tcl
+ [_options addObject:@"description"]; // portmain.tcl
+ [_options addObject:@"homepage"]; // portmain.tcl
+ [_options addObject:@"worksrcdir"]; // portmain.tcl
+ [_options addObject:@"filesdir"]; // portmain.tcl
+ [_options addObject:@"distname"]; // portmain.tcl
+ [_options addObject:@"portdbpath"]; // portmain.tcl
+ [_options addObject:@"libpath"]; // portmain.tcl
+ [_options addObject:@"distpath"]; // portmain.tcl
+ [_options addObject:@"sources_conf"]; // portmain.tcl
+ [_options addObject:@"os.platform"]; // portmain.tcl
+ [_options addObject:@"os.version"]; // portmain.tcl
+ [_options addObject:@"os.major"]; // portmain.tcl
+ [_options addObject:@"os.arch"]; // portmain.tcl
+ [_options addObject:@"os.endian"]; // portmain.tcl
+ [_options addObject:@"platforms"]; // portmain.tcl
+ [_options addObject:@"default_variants"]; // portmain.tcl
+ [_options addObject:@"install.user"]; // portmain.tcl
+ [_options addObject:@"install.group"]; // portmain.tcl
+ [_options addObject:@"macosx_deployment_target"]; // portmain.tcl
+ [_options addObject:@"universal_variant"]; // portmain.tcl
+ [_options addObject:@"os.universal_supported"]; // portmain.tcl
+
+ [_options addObject:@"master_sites"]; // portfetch.tcl
+ [_options addObject:@"patch_sites"]; // portfetch.tcl
+ [_options addObject:@"extract.suffix"]; // portfetch.tcl
+ [_options addObject:@"distfiles"]; // portfetch.tcl
+ [_options addObject:@"patchfiles"]; // portfetch.tcl
+ [_options addObject:@"use_zip"]; // portfetch.tcl
+ [_options addObject:@"use_bzip2"]; // portfetch.tcl
+ [_options addObject:@"use_lzma"]; // portfetch.tcl
+ [_options addObject:@"use_dmg"]; // portfetch.tcl
+ [_options addObject:@"dist_subdir"]; // portfetch.tcl
+ [_options addObject:@"fetch.type"]; // portfetch.tcl
+ [_options addObject:@"fetch.user"]; // portfetch.tcl
+ [_options addObject:@"fetch.password"]; // portfetch.tcl
+ [_options addObject:@"fetch.use_epsv"]; // portfetch.tcl
+ [_options addObject:@"fetch.ignore_sslcert"]; // portfetch.tcl
+ [_options addObject:@"master_sites.mirror_subdir"]; // portfetch.tcl
+ [_options addObject:@"patch_sites.mirror_subdir"]; // portfetch.tcl
+ [_options addObject:@"portname"]; // portfetch.tcl
+ [_options addObject:@"cvs.module"]; // portfetch.tcl
+ [_options addObject:@"cvs.root"]; // portfetch.tcl
+ [_options addObject:@"cvs.password"]; // portfetch.tcl
+ [_options addObject:@"cvs.date"]; // portfetch.tcl
+ [_options addObject:@"cvs.tag"]; // portfetch.tcl
+ [_options addObject:@"cvs.method"]; // portfetch.tcl
+ [_options addObject:@"svn.url"]; // portfetch.tcl
+ [_options addObject:@"svn.tag"]; // portfetch.tcl
+ [_options addObject:@"svn.method"]; // portfetch.tcl
+ [_options addObject:@"git.url"]; // portfetch.tcl
+ [_options addObject:@"git.branch"]; // portfetch.tcl
+ [_options addObject:@"hg.url"]; // portfetch.tcl
+ [_options addObject:@"hg.tag"]; // portfetch.tcl
+ [_options addObject:@"build.target"]; // portbuild.tcl
+ [_options addObject:@"build.nice"]; // portbuild.tcl
+ [_options addObject:@"build.jobs"]; // portbuild.tcl
[_options addObject:@"use_parallel_build"];
- [_options addObject:@"description"];
- [_options addObject:@"long_description"];
- [_options addObject:@"master_sites"];
[_options addObject:@"checksums"];
[_options addObject:@"patchfiles"];
[_options addObject:@"depends_run"];
[_options addObject:@"depends_build"];
[_options addObject:@"depends_lib"];
- [_options addObject:@"distname"];
- [_options addObject:@"extract.suffix"];
- [_options addObject:@"use_zip"];
[_options addObject:@"universal_variant"];
[_options addObject:@"build.target"];
- [_options addObject:@"test.run"];
- [_options addObject:@"test.target"];
[_options addObject:@"destroot.destdir"];
[_options addObject:@"livecheck.check"];
[_options addObject:@"livecheck.url"];
[_options addObject:@"livecheck.regex"];
[_options addObject:@"livecheck.distname"];
- [_options addObject:@"worksrcdir"];
+ [_options addObject:@"test.run"]; // porttest.tcl
+ [_options addObject:@"test.target"]; // porttest.tcl
// *some* overlap with options
_defaults = [[NSMutableDictionary alloc] initWithCapacity:0];
- [_defaults setObject:@"/opt/local" forKey:@"prefix"];
- [_defaults setObject:@"" forKey:@"destroot"];
- [_defaults setObject:@"" forKey:@"distname"];
- [_defaults setObject:@"" forKey:@"os.arch"];
+ [_defaults setObject:@"XXX" forKey:@"distpath"]; // portmain.tcl
+ [_defaults setObject:@"XXX" forKey:@"workpath"]; // portmain.tcl
+ [_defaults setObject:@"XXX" forKey:@"worksymlink"]; // portmain.tcl
+ [_defaults setObject:@"/opt/local" forKey:@"prefix"]; // portmain.tcl
+ [_defaults setObject:@"/usr/X11R6" forKey:@"x11prefix"]; // portmain.tcl
+ [_defaults setObject:@"/Applications/MacPorts" forKey:@"applications_dir"]; // portmain.tcl
+ [_defaults setObject:@"${prefix}/Library/Frameworks" forKey:@"frameworks_dir"]; // portmain.tcl
+ [_defaults setObject:@"destroot" forKey:@"destdir"]; // portmain.tcl
+ [_defaults setObject:@"${workpath}/${destdir}" forKey:@"destpath"]; // portmain.tcl
+ [_defaults setObject:@"${destpath}" forKey:@"destroot"]; // portmain.tcl
+ [_defaults setObject:@"files" forKey:@"filesdir"]; // portmain.tcl
+ [_defaults setObject:@"0" forKey:@"revision"]; // portmain.tcl
+ [_defaults setObject:@"0" forKey:@"epoch"]; // portmain.tcl
+ [_defaults setObject:@"${portname}-${portversion}" forKey:@"distname"]; // portmain.tcl
+ [_defaults setObject:@"${distname}" forKey:@"worksrcdir"]; // portmain.tcl
+ [_defaults setObject:@"[file join ${portpath} ${filesdir}]" forKey:@"filespath"]; // portmain.tcl
+ [_defaults setObject:@"[file join ${workpath} ${worksrcdir}]" forKey:@"worksrcpath"]; // portmain.tcl
+
+ [_defaults setObject:@"XXX" forKey:@"os.arch"]; // portmain.tcl
+
[_defaults setObject:@"" forKey:@"configure.cflags"];
[_defaults setObject:@"" forKey:@"configure.ldflags"];
- [_defaults setObject:@".tar.gz" forKey:@"extract.suffix"];
+ [_defaults setObject:@".tar.gz" forKey:@"extract.suffix"]; // portfetch.tcl
+ [_defaults setObject:@"standard" forKey:@"fetch.type"]; // portfetch.tcl
+ [_defaults setObject:@"XXX" forKey:@"svn.cmd"]; // portfetch.tcl
+ [_defaults setObject:@"${workpath}" forKey:@"svn.dir"]; // portfetch.tcl
+ [_defaults setObject:@"export" forKey:@"svn.method"]; // portfetch.tcl
+ [_defaults setObject:@"" forKey:@"svn.tag"]; // portfetch.tcl
+ [_defaults setObject:@"" forKey:@"svn.env"]; // portfetch.tcl
+ [_defaults setObject:@"--non-interactive" forKey:@"svn.pre_args"]; // portfetch.tcl
+ [_defaults setObject:@"" forKey:@"svn.args"]; // portfetch.tcl
+ [_defaults setObject:@"${svn.url}" forKey:@"svn.post_args"]; // portfetch.tcl
+ [_defaults setObject:@"${workpath}" forKey:@"git.dir"]; // portfetch.tcl
+ [_defaults setObject:@"" forKey:@"git.branch"]; // portfetch.tcl
+ [_defaults setObject:@"${workpath}" forKey:@"hg.dir"]; // portfetch.tcl
+ [_defaults setObject:@"tip" forKey:@"hg.tag"]; // portfetch.tcl
+ [_defaults setObject:@"[suffix ${distname}" forKey:@"distfiles"]; // portfetch.tcl
+ [_defaults setObject:@"${portname}" forKey:@"dist_subdir"]; // portfetch.tcl
+ [_defaults setObject:@"" forKey:@"fetch.user"]; // portfetch.tcl
+ [_defaults setObject:@"" forKey:@"fetch.password"]; // portfetch.tcl
+ [_defaults setObject:@"yes" forKey:@"fetch.use_epsv"]; // portfetch.tcl
+ [_defaults setObject:@"no" forKey:@"fetch.ignore_sslcert"]; // portfetch.tcl
+ [_defaults setObject:@"no" forKey:@"fetch.remote_time"]; // portfetch.tcl
+ [_defaults setObject:@"macports" forKey:@"fallback_mirror_site"]; // portfetch.tcl
+ [_defaults setObject:@"macports_distfiles" forKey:@"global_mirror_site"]; // portfetch.tcl
+ [_defaults setObject:@"mirror_sites.tcl" forKey:@"mirror_sites.listfile"]; // portfetch.tcl
+ [_defaults setObject:@"port1.0/fetch" forKey:@"mirror_sites.listpath"]; // portfetch.tcl
+
+ [_defaults setObject:@"${workpath}/${worksrcdir}" forKey:@"build.dir"]; // portbuild.tcl
+ [_defaults setObject:@"XXX" forKey:@"build.cmd"]; // portbuild.tcl
+ [_defaults setObject:@"XXX" forKey:@"build.nice"]; // portbuild.tcl
+ [_defaults setObject:@"XXX" forKey:@"build.jobs"]; // portbuild.tcl
+ [_defaults setObject:@"${build.target}" forKey:@"build.pre_args"]; // portbuild.tcl
+ [_defaults setObject:@"all" forKey:@"build.target"]; // portbuild.tcl
+
+ [_defaults setObject:@"${build.dir}" forKey:@"test.dir"]; // porttest.tcl
+ [_defaults setObject:@"${build.cmd}" forKey:@"test.cmd"]; // porttest.tcl
+ [_defaults setObject:@"${test.target}" forKey:@"test.pre_args"]; // porttest.tcl
+ [_defaults setObject:@"test" forKey:@"test.target"]; // porttest.tcl
+
+ // XXX: option_proc setup?
+ // options_export?
+
_parser = [[MPParser alloc] initWithPort:self];
return self;
Modified: users/toby/objcports/objcports.xcodeproj/project.pbxproj
===================================================================
--- users/toby/objcports/objcports.xcodeproj/project.pbxproj 2009-02-05 02:38:18 UTC (rev 46445)
+++ users/toby/objcports/objcports.xcodeproj/project.pbxproj 2009-02-05 02:47:11 UTC (rev 46446)
@@ -30,7 +30,7 @@
/* Begin PBXFileReference section */
08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
- 8DD76FA10486AA7600D96B5E /* objcports */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = objcports; sourceTree = BUILT_PRODUCTS_DIR; };
+ 8DD76FA10486AA7600D96B5E /* port */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = port; sourceTree = BUILT_PRODUCTS_DIR; };
DAD371680F0280EF0064AFF4 /* port.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = port.m; sourceTree = "<group>"; };
DAD371690F0280EF0064AFF4 /* MPArrayAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPArrayAdditions.h; sourceTree = "<group>"; };
DAD3716A0F0280EF0064AFF4 /* MPArrayAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPArrayAdditions.m; sourceTree = "<group>"; };
@@ -95,7 +95,7 @@
1AB674ADFE9D54B511CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- 8DD76FA10486AA7600D96B5E /* objcports */,
+ 8DD76FA10486AA7600D96B5E /* port */,
);
name = Products;
sourceTree = "<group>";
@@ -125,7 +125,7 @@
name = port;
productInstallPath = "$(HOME)/bin";
productName = objcports;
- productReference = 8DD76FA10486AA7600D96B5E /* objcports */;
+ productReference = 8DD76FA10486AA7600D96B5E /* port */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */
@@ -171,7 +171,7 @@
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/bin;
- PRODUCT_NAME = objcports;
+ PRODUCT_NAME = port;
};
name = Debug;
};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090204/8e685374/attachment.html>
More information about the macports-changes
mailing list