From 3a7eb7b633b0d7084b7e91983879ef91e2aa3e79 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Mon, 11 Feb 2013 15:33:52 +0000 Subject: [PATCH] Autobuild (eng): create also a folder for the distribution kit git-svn-id: svn://kolibrios.org@3237 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 40 ++++++++++++++++++++++----- data/eng/distr_data/readme_distr.txt | 9 ++++++ data/eng/games/soko | Bin 2952 -> 1943 bytes data/rus/Makefile | 1 + 4 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 data/eng/distr_data/readme_distr.txt diff --git a/data/eng/Makefile b/data/eng/Makefile index 4a2353047..ca404387b 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -9,8 +9,8 @@ REPOSITORY:=../.. KERNEL:=$(REPOSITORY)/kernel/trunk PROGS:=$(REPOSITORY)/programs -# The main goal: build kolibri.img and kolibri.iso -all: $(BUILD_DIR)/kolibri.img $(BUILD_DIR)/kolibri.iso +# The main goal: build kolibri.img, kolibri.iso and list for creating a distribution kit +all: $(BUILD_DIR)/kolibri.img $(BUILD_DIR)/kolibri.iso $(BUILD_DIR)/distr.lst # Docpak requires some documents; we place them # into 'docs' subdir and communicate with FASM @@ -302,15 +302,14 @@ Makefile.skins: $(REPOSITORY)/skins/authors.txt $(REPOSITORY)/data/generate_make cut -f1 $< | $(SHELL) $(REPOSITORY)/data/generate_makefile_skins.sh > $@ include Makefile.skins -# Extra targets for LiveCD image in the syntax of mkisofs -MKISOFS_EXTRA:=\ +# Extra targets for the distribution kit and LiveCD image in the syntax of mkisofs +EXTRA:=\ emu/e80/e80=e80 \ emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ /=distr_data/autorun.inf \ /=distr_data/KolibriOS_icon.ico \ - /=distr_data/readme.txt \ Skins/=$(REPOSITORY)/skins/authors.txt \ Docs/config.txt=docs/CONFIG.TXT \ Docs/copying.txt=docs/COPYING.TXT \ @@ -347,6 +346,14 @@ MKISOFS_EXTRA:=\ games/fara=games/fara \ games/soko/soko=games/soko \ #end of list +DISTRIBUTION_EXTRA:=\ + $(EXTRA) \ + /readme.txt=distr_data/readme_distr.txt \ +#end of list +MKISOFS_EXTRA:=\ + $(EXTRA) \ + /=distr_data/readme.txt \ +#end of list # Some macro for convenient work. # Macros for replacing '|' to escaped space '\ '. @@ -390,11 +397,23 @@ define newline endef mcopy_all_items:=$(foreach f,$(targets_full),$(mcopy_item_command)$(newline)) -# add skins to MKISOFS_EXTRA -MKISOFS_EXTRA:=$(MKISOFS_EXTRA) $(foreach f,$(SKIN_SOURCES),$(call imagepart,$(f))=$(call binarypart,$(f))) +# add skins to MKISOFS_EXTRA and DISTRIBUTION_EXTRA +allskins:=$(foreach f,$(SKIN_SOURCES),$(call imagepart,$(f))=$(call binarypart,$(f))) +MKISOFS_EXTRA:=$(MKISOFS_EXTRA) $(allskins) +DISTRIBUTION_EXTRA:=$(DISTRIBUTION_EXTRA) $(allskins) # dependencies of MKISOFS_EXTRA; we iterate through $(MKISOFS_EXTRA), # substitute "=" with space, get the 2nd word and join all results mkisofs_extra_targets:=$(call respace,$(foreach f,$(MKISOFS_EXTRA),$(word 2,$(subst =, ,$(f))))) +distribution_extra_targets:=$(call respace,$(foreach f,$(DISTRIBUTION_EXTRA),$(word 2,$(subst =, ,$(f))))) + +# Define a command for creating a symlink for an item in DISTRIBUTION_EXTRA. +makelink_item_command=ln -sr $(word 2,$(subst =, ,$(f))) distribution_kit/$(word 1,$(subst =, ,$(f))) +# Join all $(makelink_command) for all items from DISTRIBUTION_EXTRA. +make_distribution_links:=$(foreach f,$(DISTRIBUTION_EXTRA),$(makelink_item_command)$(newline)) +# Define a command for creating all directories for DISTRIBUTION_EXTRA. +# Note that $(sort) removes duplicate entries. +distribution_dirs:=$(sort $(foreach f,$(DISTRIBUTION_EXTRA),$(dir distribution_kit/$(word 1,$(subst =, ,$(f)))))) +make_distribution_dirs:=$(foreach f,$(distribution_dirs),mkdir -p $(f)$(newline)) # The first goal: floppy image. $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \ @@ -427,6 +446,13 @@ $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets) -A "KolibriOS AutoBuilder" -p "CleverMouse" -publisher "KolibriOS Team" -V "KolibriOS r$(REV)" -sysid "KOLIBRI" \ -iso-level 3 -o $(BUILD_DIR)/kolibri.iso $(BUILD_DIR)/kolibri.img $(call respace,$(MKISOFS_EXTRA)) 2>&1 +# The third goal: distribution list. +$(BUILD_DIR)/distr.lst: $(BUILD_DIR)/kolibri.img $(distribution_extra_targets) + rm -rf distribution_kit + $(call respace,$(make_distribution_dirs)) + ln -sr $(BUILD_DIR)/kolibri.img distribution_kit/kolibri.img + $(call respace,$(make_distribution_links)) + # Special targets to modify behaviour of make. .DELETE_ON_ERROR: .SUFFIXES: # delete all predefined rules diff --git a/data/eng/distr_data/readme_distr.txt b/data/eng/distr_data/readme_distr.txt new file mode 100644 index 000000000..d3b394ef6 --- /dev/null +++ b/data/eng/distr_data/readme_distr.txt @@ -0,0 +1,9 @@ +Kolibri OS 0.7.7.0+ night build. + +Changes and revisions compared with Kolibri 0.7.7.0 are described in file +readme.txt, which is placed in Docs folder. And also in OS in the application +docpak. + +Instructions for install to other information mediums and minimal system +requirements can be found in file install.txt. +Instructions for configuring can be found in file config.txt. diff --git a/data/eng/games/soko b/data/eng/games/soko index e5b95f3a26986783b4f2fbe7b0af81fc626a2245..24951d0e0418c3b046c2dc96565455eab318d94a 100644 GIT binary patch literal 1943 zcmV;I2Wa?9P(w?33jhFt00001Mv*2LLXK;4&&M{gp_L(LIVm;Q!j>ZIDS26*Jx=y? z_6GMO@M7SX+e(svj*2dny2d<2?pA-Bl+Gyf&QCw>BV&xqPLD6-)3PS9veG3{mUWL9 zmiT)Y2^p+;EdwErAGcr-tfWw1Z>NvgIdPJhQeILok6by4r0%A~4O!t5i&C|MDp=ub zCUjvC;EgnAnId~oKPNK>v;sxGaz|qiOOFuiZXOaqhz8vx1BdPET{PnK&e7<*N?uCTEah$fEN43N1$S-u82CrWm3(4>9n}Z|XJdmxrsm)SdtI_@u{-G&1C!nVZ`dps zm>?F=pZ5R_LP7V!M$1fb1Om~4kOPiQxpFAlQ;3n)B zYhvFg5e*MeY+ta$1#~FDjLTxP+X49sYxAV5!yLj?`!y1GqlDNqk1`rjmN<)4^tWvz z(Icu^ryB7d+}ch$@Op0NaEF957HSVG)&u4`x5)lN$ z^&Uj))MO#sA&>(^6VQK2AClEm__3p`; z6hvC8UFtObzCFDnho_d!(#+pWHk9`9S@{^}q4{w#M~%}lWSa9|g*5nQaiHhr6)P+) zlzCHg{euWJR|kdW#ZmV)!oz}wi_9$ItL27?W+-*5T`oTP z<_i@nN6}S>nVQ1AsNJG)A|p`CbAS^lgjQB9q z7Zkk?(PE9nCG9f5sGBYq^L+kbM6qL<$7+d=RNNbuFMz47Y;N`KT#dAU zq6HIwbR$=`*R~W@ZHa(8Tk{yV6JqO<9g>D-&Q~0}laLfS|K!c~djo>??v*y16hcQF zQj;E3MG)y^KL0CHFq@{1*r^e%^rnx2tg6U%DA}HppkYyk=3$~2Gx4r|9P2!qH+jdUr~`ai0?LKRlL9V_{N8o?>E)^D=(lpiEx0n(fIqF>ZC=ALM6{QanF`pf!@c$^V3H;1re6<5 zvAn`k+f{1IfWdYk2hCo9ERXqXbwki4iwmop6h3POu72G~+0(N=qRvZ1Pml-M^u*J; z19=GzXYP^9q;bU!wYPIy9+$SA+FctN?}p@xD@F=a;2zH!e_dXbjGkN`CDOmk)3H*$r@o ztET(mUmf(>7VciQp(kfc1wr>`Fs_=IgU>K%#)w+j*4oS!jbQURsk3)Zg?O76w!Lffs1+9eNr zr(Z1Xc^o^sdL*0D%tJg+7qc`X1dh1C2dJy=F*Vp!aH$xp@a4cSixBCa4<22IKA~=Y zwe&>gz=79~x4P`t#dq1Vqo^35GcF>0&3L+#8&LZc+||gGQocX#@42d>pL?fC&FpIs zvNDgRcU8Gmtu2ZshzNQGN+Z*v_&tM8s`QFuXTVNHnFY!%1}?1+chNru)WB4uVPzw` zR)*Pvf%d)&HK$Qh-KT}$p0r&Ry&I?YP9_!s`|R;Gsfg63{t&8xTzW#b$$;78F++GZ zMuVKnaGkbm)(>0DP?n;sC2o<^hp?QNAneRQ6ozP&n051Rl00D97#kc?f literal 2952 zcmd^B|8JA$5r6#UCAMSpn2vO1U63PX31{zI!xMF^>ce}5?~#7t)85@eL;1PafFliXt$ z|1-IUdnnfSQ$i+}wd{PsHQAu8-d*21(V!#222Y#?)hTD+bYc%M5eMo8OTF`_g9h&; z69(CcOGRwSQ@@0bz$CL1Bv$K_hOaDBm7`wYhpb@;%?nN@^GV3DWXtJcXDE9N0v}NOFwyj+PLq6?TFK&y6m2R&*6twC^H#;ukD5jPURam$+)dfq@hDj8KJ)fp@%!8E~e82~(M1@Nr|ogd`W@ z7e={_L#QYu4V#!@V5o3FmSrXVqHP`6DlimnYYK{s>{ig?KezG=dU|vd@HF}d4TGMR z+^hj%MB6vAf{;^hgM5IT#Hh1cG+eky!?^-77rNd2=NI?|O|OeauhP-77=y zvxo_|Y7EM2iA@^-t7m=jRpclMY5|Abibb$ET{sD7fJ12u0Gb_ETt7?0zXm4zHY~vv zh}(jSV{FOikyCSfBjpDHg}!OdD3%9-lNo%LCYDM9*wel}U>tGawgP=h(g}HR{5*(- zyos$8@;Y{T|IukZ+M`-7(I>Mp*`)CAL1J8GM0x1@kcNN$FIi5Y?u2$ZslSYUJAXPW zfHeC6mPzI`WbcGxPBJHey8@-0RLTMjxs0uuKtM0Z{FYhvX>qeKp&cWDl&mP-KmVyN z_qQP|V>*`)8a=k@=cb&tWSo%WL{pBw0m<(YjR~E{uEvKoiEDfle;F2dDFD;Bj_Amk z{Ka3*v6YzeQ$FlWrQ2A0#DR4Tr3o1(gRNQ`?bS>#o!GXvT8omT;4D*ZBV*XI7 z^(6Za2&F@iR8Z%M*OS-D*m81_1T}35j6gYe%=)U?62An6jlBofK|P!suOe&7<_~O5UQ}hn5D)p&$ z@GWpiXtYtCx~m-&3HX?D#?~sb*Ho#`R)!`~!Iq4e-h@*VBQ6a&D}4um2#w?Ps(W;V z3ghNbMwW}B^(1rWzvnhUNz)xdUfc6bQFxzYgrq(PuQS$So>Mt#^vyMZfbf{IPmh_w z<-TbG(T36^6%ca?bbDvI6+Cby3d%VqF*7rxRA7V3K)~VzG<4g4z$fw3gg#liDd(Ov zjKL8&?$qyKIe8wIA_fCr?=QnJXtY%&-b~%o3KI^o7Q5@K+hSQOM1`~kD2?t=ixY~* zX0aBVj*eUt%Mg;mUZ_x`M)eWDS*GDTk7U^(E5coxl(hBh{@8yMQIjG78rR;` z?1sJ6j8UI2Fc``bF6Ba2cl~Za7{f>jR}&CJ$bCzOC0DV8m!5Z^k*b%{s0q1%7}lQy z>hpSbWR3}s$ZJBeRJI!fuj9Fu1-qKnY|YFCL}et=sB&z&xv7#4m@s|*;T)&6FUytj z59c|ZUB?>j`kbywn1KnQ^LV^z@nafI2{Rg)f{g%%Dm@^e=k#v3bQgx8UEA$u+m|BL z+4Zc;Uc&xhcZ+zNMrWl2s;GK4EGewEmvG+@3Z;jQLcze9`BUhN@Fx|LGqkt)+R~B{ zFlcX+7$DXp2*Uqhj}-GMx|!qDl?AJkpiT)!+5pFJyE+zOvB`Aw;uZujbPo}P28Ffm zCbx=4$7xhC!6MuO{1mmEW=G~~r&Na6mlW?dvt7-V1jKS2#?b3h!Ij)U)w3i!FTp~5H_^_B(t zlI#b#`BT^=40_7Fe*#HS)8}pXq&sXkiZyNCJurYU@mb@MZIT~Gx7~QyYA_7zjHJaN~QPAJ(E@pkU_ZQiY!;m))hCNd$H5TeBl>lfw&XXxnd zit$v=*kAq|*nxK+=G7#$5i)^uZaR9c;!#lRZ65TN2Iv`Ip?lj4(lwa=(g|3&?-eU` zpVMt*(4Jf4R$K(mRpje#v8F%>UKkGAaO3(y=|*Eb2Hr$sl_=@qdh9|mhHw@4`_7Gb^QzBo+_1D zDSn)qSt+J8-~4hDw6w=1w{%+e`+NNR zEo-e+bsH>AKY8g8uG*}`n53>Gl&_MNrod^6_&HtO9w~PCBkKgj+t^