Changeset 18
- Timestamp:
- 11/06/06 21:26:50 (2 years ago)
- Files:
-
- trunk/dsss.conf (modified) (2 diffs)
- trunk/sss/conf.d (modified) (5 diffs)
- trunk/sss/main.d (modified) (7 diffs)
- trunk/sss/net.d (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/dsss.conf
r17 r18 1 [*] 2 buildflags = -g 3 4 [hcf] 5 1 6 [sss] 2 7 # these are not useful in the library 3 8 exclude = sss/main.d sss/dsssdll.d sss/stub.d 9 10 # this has bootstrapping issues if included it (depends on Mango) 11 exclude += sss/net.d 12 4 13 # proper use of sss requires mango 5 6 14 # sss depends on dsss_build/util 7 buildflags = - Idsss_build15 buildflags = -g -Idsss_build 8 16 prebuild = cd dsss_build ; $DSSS build ; cd .. ; getmango.d 9 17 preclean = cd dsss_build ; $DSSS distclean … … 41 49 42 50 # postinstall: install dsss_build 43 postinstall = install dsss_build/dsss_build$EXE_EXT $BIN_PREFIX \44 sss/stub.d $INCLUDE_PREFIX/sss51 postinstall = install dsss_build/dsss_build$EXE_EXT $BIN_PREFIX ; \ 52 install sss/stub.d $INCLUDE_PREFIX/sss 45 53 46 54 target=dsss 47 buildflags =-Idsss_build -LIBPATH=dsss_build55 buildflags = -g -Idsss_build -LIBPATH=dsss_build trunk/sss/conf.d
r17 r18 81 81 char[] manifestPrefix; 82 82 83 /** The prefix to which the source list is downloaded */ 84 char[] srcListPrefix; 85 86 /** The prefix for scratch work */ 87 char[] scratchPrefix; 88 83 89 /** The location of stub.d (used to make stub D libraries) */ 84 90 char[] stubDLoc; … … 169 175 "dsss" ~ std.path.sep ~ 170 176 "manifest"; 171 172 // set some environment variables 177 srcListPrefix = forcePrefix ~ std.path.sep ~ 178 "share" ~ std.path.sep ~ 179 "dsss" ~ std.path.sep ~ 180 "sources"; 181 182 // set the scratch prefix and some some environment variables 173 183 version (Posix) { 184 scratchPrefix = "/tmp"; 185 174 186 setEnvVar("DSSS", installPrefix ~ "/dsss"); 175 187 setEnvVar("PREFIX", forcePrefix); … … 189 201 setEnvVar("LD_LIBRARY_PATH", ldlibp); 190 202 } else version (Windows) { 203 scratchPrefix = forcePrefix ~ std.path.sep ~ "tmp"; 204 191 205 setEnvVar("DSSS", installPrefix ~ "/dsss.exe"); 192 206 setEnvVar("PREFIX", forcePrefix); … … 344 358 conf.settings[""] = null; 345 359 conf.settings[""]["name"] = getBaseName(getcwd()); 346 conf.settings[""]["version"] = " 0.0.0";360 conf.settings[""]["version"] = "latest"; 347 361 348 362 // parse line-by-line … … 687 701 if (ext == "d") { 688 702 // if it's a .d file, -exec it 689 saySystemDie(dsss_build ~ "- exec " ~ cmd);703 saySystemDie(dsss_build ~ "-clean -exec " ~ cmd); 690 704 } else if (cmd.length > 8 && 691 705 cmd[0..8] == "install ") { trunk/sss/main.d
r15 r18 37 37 import sss.genconfig; 38 38 import sss.install; 39 import sss.net; 39 40 import sss.uninstall; 40 41 … … 48 49 INSTALL, 49 50 UNINSTALL, 51 NET, 50 52 GENCONFIG 51 53 } … … 122 124 command = cmd_t.UNINSTALL; 123 125 126 } else if (arg == "net") { 127 commandSet = true; 128 command = cmd_t.NET; 129 124 130 } else if (arg == "genconfig") { 125 131 commandSet = true; … … 129 135 130 136 } else if (command == cmd_t.GENCONFIG || 131 command == cmd_t.UNINSTALL) { 137 command == cmd_t.UNINSTALL || 138 command == cmd_t.NET) { 132 139 /* commands with no special options (put them in their own else-if 133 140 * if they gain options */ … … 225 232 case cmd_t.UNINSTALL: 226 233 return sss.uninstall.uninstall(buildElems); 234 break; 235 236 case cmd_t.NET: 237 return sss.net.net(buildElems); 227 238 break; 228 239 … … 248 259 install: install all or some binaries or libraries 249 260 uninstall: uninstall a specified tool or library 261 net: Internet-based installation and package management 250 262 genconfig: generate a config file 251 263 Each command has its own set of options, which are not listed here. To list … … 290 302 ); 291 303 304 } else if (command == cmd_t.NET) { 305 writefln( 306 `Usage: dsss [dsss options] net <net command> <package name> 307 Net Commands: 308 install: Install a package via the network source` 309 ); 310 311 292 312 } else if (command == cmd_t.GENCONFIG) { 293 313 writefln(
