diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages index cfa52a51a3..fe23c62f79 100644 --- a/build/jam/HaikuPackages +++ b/build/jam/HaikuPackages @@ -6,8 +6,6 @@ local packages = [ FFilterByBuildFeatures HaikuExtras HaikuLoader HaikuSource - HaikuUserguide - HaikuWelcome MakefileEngine NetFS UserlandFS diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 47ca63767f..40884d1e92 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -151,30 +151,29 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] { # Welcome if [ IsOptionalHaikuImagePackageAdded Welcome ] { - AddPackageFilesToHaikuImage system packages : - haiku_userguide_ca.hpkg - haiku_userguide_de.hpkg - haiku_userguide_en.hpkg - haiku_userguide_es.hpkg - haiku_userguide_fi.hpkg - haiku_userguide_fur.hpkg - haiku_userguide_fr.hpkg - haiku_userguide_hu.hpkg - haiku_userguide_id.hpkg - haiku_userguide_it.hpkg - haiku_userguide_jp.hpkg - haiku_userguide_pl.hpkg - haiku_userguide_pt_BR.hpkg - haiku_userguide_pt_PT.hpkg - haiku_userguide_ro.hpkg - haiku_userguide_ru.hpkg - haiku_userguide_sk.hpkg - haiku_userguide_sv_SE.hpkg - haiku_userguide_tr.hpkg - haiku_userguide_uk.hpkg - haiku_userguide_zh_CN.hpkg - haiku_welcome.hpkg - : nameFromMetaInfo ; + Echo AddHaikuImageSystemPackages + haiku_userguide_ca + haiku_userguide_de + haiku_userguide_en + haiku_userguide_es + haiku_userguide_fi + haiku_userguide_fur + haiku_userguide_fr + haiku_userguide_hu + haiku_userguide_id + haiku_userguide_jp + haiku_userguide_pl + haiku_userguide_pt_br + haiku_userguide_pt_pt + haiku_userguide_ro + haiku_userguide_ru + haiku_userguide_sk + haiku_userguide_sv_se + haiku_userguide_tr + haiku_userguide_uk + haiku_userguide_zh_cn + haiku_welcome + ; AddSymlinkToHaikuImage home Desktop : /boot/system/bin/quicktour : Quick\ Tour ; diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index cbfb30dafe..7bca89a614 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -3,6 +3,10 @@ # import everything from the minimum image include [ FDirName $(HAIKU_BUILD_RULES_DIR) images definitions minimum ] ; +SEARCH on [ FGristFiles userguide quicktour welcome ] + = [ FDirName $(HAIKU_TOP) data bin ] ; +SYSTEM_BIN += userguide quicktour welcome ; + SYSTEM_BIN += [ FFilterByBuildFeatures cddb_lookup clipboard CortexAddOnHost diff --git a/build/jam/packages/HaikuUserguide b/build/jam/packages/HaikuUserguide deleted file mode 100644 index 114c1a6e2d..0000000000 --- a/build/jam/packages/HaikuUserguide +++ /dev/null @@ -1,314 +0,0 @@ -# CA -local haikuUserGuidePackageCA = haiku_userguide_ca.hpkg ; -HaikuPackage $(haikuUserGuidePackageCA) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide ca ] - : ca ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageCA) : haiku_userguide_ca ; - -# DE -local haikuUserGuidePackageDE = haiku_userguide_de.hpkg ; -HaikuPackage $(haikuUserGuidePackageDE) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide de ] - : de ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageDE) : haiku_userguide_de ; - -# EN -local haikuUserGuidePackageEN = haiku_userguide_en.hpkg ; -HaikuPackage $(haikuUserGuidePackageEN) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide en ] - : en ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageEN) : haiku_userguide_en ; - -# ES -local haikuUserGuidePackageES = haiku_userguide_es.hpkg ; -HaikuPackage $(haikuUserGuidePackageES) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide es ] - : es ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageES) : haiku_userguide_es ; - -# FI -local haikuUserGuidePackageFI = haiku_userguide_fi.hpkg ; -HaikuPackage $(haikuUserGuidePackageFI) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide fi ] - : fi ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageFI) : haiku_userguide_fi ; - -# FR -local haikuUserGuidePackageFR = haiku_userguide_fr.hpkg ; -HaikuPackage $(haikuUserGuidePackageFR) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide fr ] - : fr ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageFR) : haiku_userguide_fr ; - -# FUR -local haikuUserGuidePackageFUR = haiku_userguide_fur.hpkg ; -HaikuPackage $(haikuUserGuidePackageFUR) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide fur ] - : fur ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageFUR) : haiku_userguide_fur ; - -# HU -local haikuUserGuidePackageHU = haiku_userguide_hu.hpkg ; -HaikuPackage $(haikuUserGuidePackageHU) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide hu ] - : hu ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageHU) : haiku_userguide_hu ; - -# ID -local haikuUserGuidePackageID = haiku_userguide_id.hpkg ; -HaikuPackage $(haikuUserGuidePackageID) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide id ] - : id ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageID) : haiku_userguide_id ; - -# IT -local haikuUserGuidePackageIT = haiku_userguide_it.hpkg ; -HaikuPackage $(haikuUserGuidePackageIT) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide it ] - : it ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageIT) : haiku_userguide_it ; - -# JP -local haikuUserGuidePackageJP = haiku_userguide_jp.hpkg ; -HaikuPackage $(haikuUserGuidePackageJP) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide jp ] - : jp ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageJP) : haiku_userguide_jp ; - -# PL -local haikuUserGuidePackagePL = haiku_userguide_pl.hpkg ; -HaikuPackage $(haikuUserGuidePackagePL) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide pl ] - : pl ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackagePL) : haiku_userguide_pl ; - -# PT_BR -local haikuUserGuidePackagePT_BR = haiku_userguide_pt_BR.hpkg ; -HaikuPackage $(haikuUserGuidePackagePT_BR) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide pt_BR ] - : pt_BR ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackagePT_BR) : haiku_userguide_pt_BR ; - -# PT_PT -local haikuUserGuidePackagePT_PT = haiku_userguide_pt_PT.hpkg ; -HaikuPackage $(haikuUserGuidePackagePT_PT) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide pt_PT ] - : pt_PT ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackagePT_PT) : haiku_userguide_pt_PT ; - -# RO -local haikuUserGuidePackageRO = haiku_userguide_ro.hpkg ; -HaikuPackage $(haikuUserGuidePackageRO) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide ro ] - : ro ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageRO) : haiku_userguide_ro ; - -# RU -local haikuUserGuidePackageRU = haiku_userguide_ru.hpkg ; -HaikuPackage $(haikuUserGuidePackageRU) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide ru ] - : ru ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageRU) : haiku_userguide_ru ; - -# SK -local haikuUserGuidePackageSK = haiku_userguide_sk.hpkg ; -HaikuPackage $(haikuUserGuidePackageSK) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide sk ] - : sk ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageSK) : haiku_userguide_sk ; - -# SV_SE -local haikuUserGuidePackageSV_SE = haiku_userguide_sv_SE.hpkg ; -HaikuPackage $(haikuUserGuidePackageSV_SE) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide sv_SE ] - : sv_SE ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageSV_SE) : haiku_userguide_sv_SE ; - -# TR -local haikuUserGuidePackageTR = haiku_userguide_tr.hpkg ; -HaikuPackage $(haikuUserGuidePackageTR) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide tr ] - : tr ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageTR) : haiku_userguide_tr ; - -# UK -local haikuUserGuidePackageUK = haiku_userguide_uk.hpkg ; -HaikuPackage $(haikuUserGuidePackageUK) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide uk ] - : uk ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageUK) : haiku_userguide_uk ; - -# ZH_CN -local haikuUserGuidePackageZH_CN = haiku_userguide_zh_CN.hpkg ; -HaikuPackage $(haikuUserGuidePackageZH_CN) ; - -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide zh_CN ] - : zh_CN ; -CopyDirectoryToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide images ] - : images ; -AddFilesToPackage documentation userguide : [ FDirName $(HAIKU_TOP) docs userguide Haiku-doc.css ] - : Haiku-doc.css ; -SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; -AddFilesToPackage bin : userguide ; - -BuildHaikuPackage $(haikuUserGuidePackageZH_CN) : haiku_userguide_zh_CN ; diff --git a/build/jam/packages/HaikuWelcome b/build/jam/packages/HaikuWelcome deleted file mode 100644 index 95837a450e..0000000000 --- a/build/jam/packages/HaikuWelcome +++ /dev/null @@ -1,11 +0,0 @@ -local haikuWelcomePackage = haiku_welcome.hpkg ; -HaikuPackage $(haikuWelcomePackage) ; - -CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ] - : welcome ; - -SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ; - -AddFilesToPackage bin : quicktour welcome ; - -BuildHaikuPackage $(haikuWelcomePackage) : haiku_welcome ; diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku index 2543fd6a07..884ea44b2a 100644 --- a/build/jam/repositories/Haiku +++ b/build/jam/repositories/Haiku @@ -22,28 +22,6 @@ if $(HAIKU_IS_BOOTSTRAP) != 1 && $(HAIKU_BUILD_TYPE) != minimum { packages += [ FFilterByBuildFeatures haiku_extras haiku_source - haiku_userguide_ca - haiku_userguide_de - haiku_userguide_en - haiku_userguide_es - haiku_userguide_fi - haiku_userguide_fr - haiku_userguide_fur - haiku_userguide_hu - haiku_userguide_id - haiku_userguide_it - haiku_userguide_jp - haiku_userguide_pl - haiku_userguide_pt_BR - haiku_userguide_pt_PT - haiku_userguide_ro - haiku_userguide_ru - haiku_userguide_sk - haiku_userguide_sv_SE - haiku_userguide_tr - haiku_userguide_uk - haiku_userguide_zh_CN - haiku_welcome makefile_engine netfs userland_fs