From 8e2572245ff403506de91bcb86236a2a64f47023 Mon Sep 17 00:00:00 2001 From: Ferdinand Majerech Date: Tue, 16 Aug 2011 18:35:27 +0200 Subject: [PATCH] Improved package targets in cdc, added a zip package target, updated the Getting Started tutorial with a link to D:YAML at GitHub. --- cdc.d | 20 ++++++++++++------ doc/doctrees/environment.pickle | Bin 12354 -> 12354 bytes .../tutorials/getting_started.doctree | Bin 31780 -> 31900 bytes .../_sources/tutorials/getting_started.txt | 5 +++-- doc/html/tutorials/getting_started.html | 5 +++-- docsrc/tutorials/getting_started.rst | 5 +++-- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/cdc.d b/cdc.d index 6fb36f9..10d83aa 100755 --- a/cdc.d +++ b/cdc.d @@ -183,7 +183,7 @@ void main(string[] args) void build_tar_gz() { - if(system("tar cf dyaml.tar * && gzip -9v dyaml.tar ") != 0) + if(system("git archive HEAD | gzip -9v > dyaml.tar.gz") != 0) { writeln("Error creating a tar.gz package."); } @@ -191,12 +191,20 @@ void main(string[] args) void build_tar_xz() { - if(system("tar cf dyaml.tar * && xz -9ev dyaml.tar ") != 0) + if(system("git archive HEAD | xz -9ev > dyaml.tar.xz ") != 0) { writeln("Error creating a tar.xz package."); } } + void build_zip() + { + if(system("git archive -odyaml.zip -9 HEAD") != 0) + { + writeln("Error creating a zip package"); + } + } + void build(string[] targets ...) { foreach(target; targets) @@ -209,6 +217,7 @@ void main(string[] args) case "unittest": build_unittest(); break; case "tar.gz": build_tar_gz(); break; case "tar.xz": build_tar_xz(); break; + case "zip": build_zip(); break; case "all": build("debug", "release", "unittest"); break; default: writeln("unknown build target: ", target); @@ -244,10 +253,9 @@ void help() " Optimizations, inlining enabled.\n" " Target binary name: 'pong-release'\n" " all All of the above.\n" - " tar.gz Unix/Linux only: Create a tar.gz package\n" - " (this just archives the directory at the moment)\n" - " tar.xz Unix/Linux only: Create a tar.xz package\n" - " (this just archives the directory at the moment)\n" + " tar.gz Needs git, gzip: Create a tar.gz package.\n" + " tar.xz Needs git, xz: Create a tar.xz package.\n" + " zip Needs zip: Create a zip package.\n" "\n" "Available options:\n" " -h --help Show this help information.\n" diff --git a/doc/doctrees/environment.pickle b/doc/doctrees/environment.pickle index b13884a2a8a2712853d2877a39d2e9e231f6ab62..dd88601cad501852892804ec4838208971ff5954 100644 GIT binary patch delta 62 zcmX?(Z%fYn&QNuCygX^yw;AQHGV~zK`9}mZ%puGb~25auj)!_5(T GuNVOhBOkf| delta 62 zcmX?XH)l9bP82Ym>?&Bn z=skI#;A2ML&5MNAFfzt(_7_QFWK5d8Ni-5j@`(LsOxesM?!(NOzBy9rJ1b-E=0F8D zR>tDZ5vuwujAffUH1D!8)@@ERh-PMNoqWhRma%oSg2@Xe#`eve=D*n)Cv0Z5Kf}yF z6>4+Qc}4~Xpyh>5hLZ)II~b==p5^?6apvZF7kx&?*_+q9-e6*!H@U-O1LM-kmY#8p zOE=H(EN5g~zFEMVU6^t4WVv`9Ev|%&)S^@cn~ai@f?_Lu{q)R|jM5~%MK{vX*JpA-oS2Y8Vo`ENW?8C^LTW`xQDSll*W?Ka8j}~qr7?0%W{-CUlHTz$ z^*Rg;3`84jmk^(!Q(LrwiGe{QlqD}QH#I9A$j%6gPy!l5*kMH*L8=X7GYn!g^kOsg zV>2cPB(qK45Fe+i?H@sPW5M delta 473 zcmbR9lX1xp#tl}yjCPZ)d82{kbl#7Q4x2mqs+o8^Gt4uXGAv>XH)l9bP82Ym>?&Bn z=rwtt;A2Lg&5MNAFfzt%_7_QFWK5jANi-5j@`(LsOy0~R?!(NOwmDMjJ1b+(=0F8D zR>q>u5vuwujHR19H1D!8)^1KSh-PMNnS97Nma%2Cg2@Xe#o z0=2p5JR<`G(DFhj!^wiq9gNc^&vJgkIAe3Yi#{Xctj+6PZ!j^=o!sHEfpN)XOV2pQ zC7Wk>mNPOg+brPCF3i|E*(P3xMphA%0MH?sQ`-n~EN(kg)2MR%LY)&Y~ZllIzgG5~{Qk(M=T^SiQH*ZY>hLP@M z!L(b9`kUXRnKLpPO;*Y1W;B_+A!8<^*<`QG=ZqGcjj~oTF{*FAo72I@s5v>U_&d<^ IaV2&f08_-9p#T5? diff --git a/doc/html/_sources/tutorials/getting_started.txt b/doc/html/_sources/tutorials/getting_started.txt index 1cf6cff..e6d45bf 100644 --- a/doc/html/_sources/tutorials/getting_started.txt +++ b/doc/html/_sources/tutorials/getting_started.txt @@ -35,8 +35,9 @@ Download the version of DMD for your operating system and install it. Download and compile D:YAML ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The newest version of D:YAML can be found `here `_. Download a source -archive, extract it, and move to the extracted directory. +The newest version of D:YAML can be found +`here `_. Download a source archive, extract +it, and move to the extracted directory. D:YAML uses a modified version of the `CDC `_ script for compilation. To compile D:YAML, you first need to build CDC. diff --git a/doc/html/tutorials/getting_started.html b/doc/html/tutorials/getting_started.html index f5e45be..26b4242 100644 --- a/doc/html/tutorials/getting_started.html +++ b/doc/html/tutorials/getting_started.html @@ -71,8 +71,9 @@ however, at the moment they are not as up to date as DMD.

Download and compile D:YAMLΒΆ

-

The newest version of D:YAML can be found here. Download a source -archive, extract it, and move to the extracted directory.

+

The newest version of D:YAML can be found +here. Download a source archive, extract +it, and move to the extracted directory.

D:YAML uses a modified version of the CDC script for compilation. To compile D:YAML, you first need to build CDC. Do this by typing the following command into the console:

diff --git a/docsrc/tutorials/getting_started.rst b/docsrc/tutorials/getting_started.rst index 1cf6cff..e6d45bf 100644 --- a/docsrc/tutorials/getting_started.rst +++ b/docsrc/tutorials/getting_started.rst @@ -35,8 +35,9 @@ Download the version of DMD for your operating system and install it. Download and compile D:YAML ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The newest version of D:YAML can be found `here `_. Download a source -archive, extract it, and move to the extracted directory. +The newest version of D:YAML can be found +`here `_. Download a source archive, extract +it, and move to the extracted directory. D:YAML uses a modified version of the `CDC `_ script for compilation. To compile D:YAML, you first need to build CDC.