From 70c023947d9114a4f9772e47c4095b403aa1ee4f Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 7 Apr 2012 21:09:10 +0000 Subject: [PATCH] Moved Snoopy from Utilities to System drawer. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44560 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- .../Icons/Medium/AROS/System}/Snoopy.info.src | 0 .../Gorilla/Icons/Medium/AROS/System}/Snoopy.png | Bin .../Gorilla/Icons/Medium/AROS/System/mmakefile.src | 2 +- workbench/{utilities => system}/Snoopy/README | 0 .../{utilities => system}/Snoopy/catalogs/czech.ct | 0 .../{utilities => system}/Snoopy/catalogs/deutsch.ct | 0 .../system/Snoopy/catalogs/espa\303\261ol.ct" | 0 .../system/Snoopy/catalogs/fran\303\247ais.ct" | 0 .../Snoopy/catalogs/hrvatski.ct | 0 .../Snoopy/catalogs/italiano.ct | 0 workbench/system/Snoopy/catalogs/mmakefile.src | 7 +++++++ .../{utilities => system}/Snoopy/catalogs/polski.ct | 0 .../system/Snoopy/catalogs/portugu\303\252s.ct" | 0 .../{utilities => system}/Snoopy/catalogs/russian.ct | 0 .../{utilities => system}/Snoopy/catalogs/snoopy.cd | 0 workbench/{utilities => system}/Snoopy/gui.c | 0 workbench/{utilities => system}/Snoopy/gui.h | 0 workbench/{utilities => system}/Snoopy/locale.c | 2 +- workbench/{utilities => system}/Snoopy/locale.h | 0 workbench/{utilities => system}/Snoopy/main.c | 0 workbench/{utilities => system}/Snoopy/main.h | 0 workbench/system/Snoopy/mmakefile.src | 18 ++++++++++++++++++ workbench/{utilities => system}/Snoopy/patches.c | 0 workbench/{utilities => system}/Snoopy/patches.h | 0 workbench/{utilities => system}/Snoopy/setup.c | 0 workbench/{utilities => system}/Snoopy/setup.h | 0 workbench/utilities/Snoopy/catalogs/mmakefile.src | 7 ------- workbench/utilities/Snoopy/icons/mmakefile.src | 10 ---------- workbench/utilities/Snoopy/mmakefile.src | 19 ------------------- 29 files changed, 27 insertions(+), 38 deletions(-) rename {workbench/utilities/Snoopy/icons => images/IconSets/Gorilla/Icons/Medium/AROS/System}/Snoopy.info.src (100%) rename {workbench/utilities/Snoopy/icons => images/IconSets/Gorilla/Icons/Medium/AROS/System}/Snoopy.png (100%) rename workbench/{utilities => system}/Snoopy/README (100%) rename workbench/{utilities => system}/Snoopy/catalogs/czech.ct (100%) rename workbench/{utilities => system}/Snoopy/catalogs/deutsch.ct (100%) rename "workbench/utilities/Snoopy/catalogs/espa\303\261ol.ct" => "workbench/system/Snoopy/catalogs/espa\303\261ol.ct" (100%) rename "workbench/utilities/Snoopy/catalogs/fran\303\247ais.ct" => "workbench/system/Snoopy/catalogs/fran\303\247ais.ct" (100%) rename workbench/{utilities => system}/Snoopy/catalogs/hrvatski.ct (100%) rename workbench/{utilities => system}/Snoopy/catalogs/italiano.ct (100%) create mode 100644 workbench/system/Snoopy/catalogs/mmakefile.src rename workbench/{utilities => system}/Snoopy/catalogs/polski.ct (100%) rename "workbench/utilities/Snoopy/catalogs/portugu\303\252s.ct" => "workbench/system/Snoopy/catalogs/portugu\303\252s.ct" (100%) rename workbench/{utilities => system}/Snoopy/catalogs/russian.ct (100%) rename workbench/{utilities => system}/Snoopy/catalogs/snoopy.cd (100%) rename workbench/{utilities => system}/Snoopy/gui.c (100%) rename workbench/{utilities => system}/Snoopy/gui.h (100%) rename workbench/{utilities => system}/Snoopy/locale.c (95%) rename workbench/{utilities => system}/Snoopy/locale.h (100%) rename workbench/{utilities => system}/Snoopy/main.c (100%) rename workbench/{utilities => system}/Snoopy/main.h (100%) create mode 100644 workbench/system/Snoopy/mmakefile.src rename workbench/{utilities => system}/Snoopy/patches.c (100%) rename workbench/{utilities => system}/Snoopy/patches.h (100%) rename workbench/{utilities => system}/Snoopy/setup.c (100%) rename workbench/{utilities => system}/Snoopy/setup.h (100%) delete mode 100644 workbench/utilities/Snoopy/catalogs/mmakefile.src delete mode 100644 workbench/utilities/Snoopy/icons/mmakefile.src delete mode 100644 workbench/utilities/Snoopy/mmakefile.src diff --git a/workbench/utilities/Snoopy/icons/Snoopy.info.src b/images/IconSets/Gorilla/Icons/Medium/AROS/System/Snoopy.info.src similarity index 100% rename from workbench/utilities/Snoopy/icons/Snoopy.info.src rename to images/IconSets/Gorilla/Icons/Medium/AROS/System/Snoopy.info.src diff --git a/workbench/utilities/Snoopy/icons/Snoopy.png b/images/IconSets/Gorilla/Icons/Medium/AROS/System/Snoopy.png similarity index 100% rename from workbench/utilities/Snoopy/icons/Snoopy.png rename to images/IconSets/Gorilla/Icons/Medium/AROS/System/Snoopy.png diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/System/mmakefile.src b/images/IconSets/Gorilla/Icons/Medium/AROS/System/mmakefile.src index 7a7d92c2b1..0f1cf7926e 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/System/mmakefile.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/System/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg -ICONS := About FixFonts Format FTManager Themes SysMon WorkBook +ICONS := About FixFonts Format FTManager Themes SysMon WorkBook Snoopy #MM- iconset-Gorilla-icons-aros-clean : iconset-Gorilla-icons-aros-system-clean #MM- iconset-Gorilla-icons-aros : iconset-Gorilla-icons-aros-system diff --git a/workbench/utilities/Snoopy/README b/workbench/system/Snoopy/README similarity index 100% rename from workbench/utilities/Snoopy/README rename to workbench/system/Snoopy/README diff --git a/workbench/utilities/Snoopy/catalogs/czech.ct b/workbench/system/Snoopy/catalogs/czech.ct similarity index 100% rename from workbench/utilities/Snoopy/catalogs/czech.ct rename to workbench/system/Snoopy/catalogs/czech.ct diff --git a/workbench/utilities/Snoopy/catalogs/deutsch.ct b/workbench/system/Snoopy/catalogs/deutsch.ct similarity index 100% rename from workbench/utilities/Snoopy/catalogs/deutsch.ct rename to workbench/system/Snoopy/catalogs/deutsch.ct diff --git "a/workbench/utilities/Snoopy/catalogs/espa\303\261ol.ct" "b/workbench/system/Snoopy/catalogs/espa\303\261ol.ct" similarity index 100% rename from "workbench/utilities/Snoopy/catalogs/espa\303\261ol.ct" rename to "workbench/system/Snoopy/catalogs/espa\303\261ol.ct" diff --git "a/workbench/utilities/Snoopy/catalogs/fran\303\247ais.ct" "b/workbench/system/Snoopy/catalogs/fran\303\247ais.ct" similarity index 100% rename from "workbench/utilities/Snoopy/catalogs/fran\303\247ais.ct" rename to "workbench/system/Snoopy/catalogs/fran\303\247ais.ct" diff --git a/workbench/utilities/Snoopy/catalogs/hrvatski.ct b/workbench/system/Snoopy/catalogs/hrvatski.ct similarity index 100% rename from workbench/utilities/Snoopy/catalogs/hrvatski.ct rename to workbench/system/Snoopy/catalogs/hrvatski.ct diff --git a/workbench/utilities/Snoopy/catalogs/italiano.ct b/workbench/system/Snoopy/catalogs/italiano.ct similarity index 100% rename from workbench/utilities/Snoopy/catalogs/italiano.ct rename to workbench/system/Snoopy/catalogs/italiano.ct diff --git a/workbench/system/Snoopy/catalogs/mmakefile.src b/workbench/system/Snoopy/catalogs/mmakefile.src new file mode 100644 index 0000000000..6c92c8b7cc --- /dev/null +++ b/workbench/system/Snoopy/catalogs/mmakefile.src @@ -0,0 +1,7 @@ +# Copyright © 2003, The AROS Development Team. All rights reserved. +# $Id$ + +include $(TOP)/config/make.cfg + +%build_catalogs mmake=workbench-system-snoopy-catalogs \ + name=Snoopy subdir=System/System diff --git a/workbench/utilities/Snoopy/catalogs/polski.ct b/workbench/system/Snoopy/catalogs/polski.ct similarity index 100% rename from workbench/utilities/Snoopy/catalogs/polski.ct rename to workbench/system/Snoopy/catalogs/polski.ct diff --git "a/workbench/utilities/Snoopy/catalogs/portugu\303\252s.ct" "b/workbench/system/Snoopy/catalogs/portugu\303\252s.ct" similarity index 100% rename from "workbench/utilities/Snoopy/catalogs/portugu\303\252s.ct" rename to "workbench/system/Snoopy/catalogs/portugu\303\252s.ct" diff --git a/workbench/utilities/Snoopy/catalogs/russian.ct b/workbench/system/Snoopy/catalogs/russian.ct similarity index 100% rename from workbench/utilities/Snoopy/catalogs/russian.ct rename to workbench/system/Snoopy/catalogs/russian.ct diff --git a/workbench/utilities/Snoopy/catalogs/snoopy.cd b/workbench/system/Snoopy/catalogs/snoopy.cd similarity index 100% rename from workbench/utilities/Snoopy/catalogs/snoopy.cd rename to workbench/system/Snoopy/catalogs/snoopy.cd diff --git a/workbench/utilities/Snoopy/gui.c b/workbench/system/Snoopy/gui.c similarity index 100% rename from workbench/utilities/Snoopy/gui.c rename to workbench/system/Snoopy/gui.c diff --git a/workbench/utilities/Snoopy/gui.h b/workbench/system/Snoopy/gui.h similarity index 100% rename from workbench/utilities/Snoopy/gui.h rename to workbench/system/Snoopy/gui.h diff --git a/workbench/utilities/Snoopy/locale.c b/workbench/system/Snoopy/locale.c similarity index 95% rename from workbench/utilities/Snoopy/locale.c rename to workbench/system/Snoopy/locale.c index 4c36e0882d..897c6f5a13 100644 --- a/workbench/utilities/Snoopy/locale.c +++ b/workbench/system/Snoopy/locale.c @@ -9,7 +9,7 @@ #define CATCOMP_ARRAY #include "strings.h" -#define CATALOG_NAME "System/Utilities/Snoopy.catalog" +#define CATALOG_NAME "System/System/Snoopy.catalog" #define CATALOG_VERSION 2 /*** Variables **************************************************************/ diff --git a/workbench/utilities/Snoopy/locale.h b/workbench/system/Snoopy/locale.h similarity index 100% rename from workbench/utilities/Snoopy/locale.h rename to workbench/system/Snoopy/locale.h diff --git a/workbench/utilities/Snoopy/main.c b/workbench/system/Snoopy/main.c similarity index 100% rename from workbench/utilities/Snoopy/main.c rename to workbench/system/Snoopy/main.c diff --git a/workbench/utilities/Snoopy/main.h b/workbench/system/Snoopy/main.h similarity index 100% rename from workbench/utilities/Snoopy/main.h rename to workbench/system/Snoopy/main.h diff --git a/workbench/system/Snoopy/mmakefile.src b/workbench/system/Snoopy/mmakefile.src new file mode 100644 index 0000000000..47089f10cd --- /dev/null +++ b/workbench/system/Snoopy/mmakefile.src @@ -0,0 +1,18 @@ +# Copyright © 2006-2008, The AROS Development Team. All rights reserved. +# $Id$ + +include $(TOP)/config/make.cfg + +FILES := gui main patches setup locale +EXEDIR := $(AROS_SYSTEM) + +#MM- workbench-system : includes linklibs workbench-system-snoopy + +#MM workbench-system-snoopy : \ +#MM workbench-system-snoopy-catalogs + +%build_prog mmake=workbench-system-snoopy \ + progname=Snoopy targetdir=$(EXEDIR) \ + files=$(FILES) uselibs="mui arossupport amiga" + +%common diff --git a/workbench/utilities/Snoopy/patches.c b/workbench/system/Snoopy/patches.c similarity index 100% rename from workbench/utilities/Snoopy/patches.c rename to workbench/system/Snoopy/patches.c diff --git a/workbench/utilities/Snoopy/patches.h b/workbench/system/Snoopy/patches.h similarity index 100% rename from workbench/utilities/Snoopy/patches.h rename to workbench/system/Snoopy/patches.h diff --git a/workbench/utilities/Snoopy/setup.c b/workbench/system/Snoopy/setup.c similarity index 100% rename from workbench/utilities/Snoopy/setup.c rename to workbench/system/Snoopy/setup.c diff --git a/workbench/utilities/Snoopy/setup.h b/workbench/system/Snoopy/setup.h similarity index 100% rename from workbench/utilities/Snoopy/setup.h rename to workbench/system/Snoopy/setup.h diff --git a/workbench/utilities/Snoopy/catalogs/mmakefile.src b/workbench/utilities/Snoopy/catalogs/mmakefile.src deleted file mode 100644 index 51b1007370..0000000000 --- a/workbench/utilities/Snoopy/catalogs/mmakefile.src +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright © 2003, The AROS Development Team. All rights reserved. -# $Id$ - -include $(TOP)/config/make.cfg - -%build_catalogs mmake=workbench-utilities-snoopy-catalogs \ - name=Snoopy subdir=System/Utilities diff --git a/workbench/utilities/Snoopy/icons/mmakefile.src b/workbench/utilities/Snoopy/icons/mmakefile.src deleted file mode 100644 index d506c93f1b..0000000000 --- a/workbench/utilities/Snoopy/icons/mmakefile.src +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright © 2004, The AROS Development Team. All rights reserved. -# $Id$ - -include $(TOP)/config/make.cfg - -ICONS := Snoopy -EXEDIR := $(AROS_UTILITIES) - -%build_icons mmake=workbench-utilities-snoopy-icons \ - icons=$(ICONS) dir=$(EXEDIR) diff --git a/workbench/utilities/Snoopy/mmakefile.src b/workbench/utilities/Snoopy/mmakefile.src deleted file mode 100644 index f446fc68bc..0000000000 --- a/workbench/utilities/Snoopy/mmakefile.src +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright © 2006-2008, The AROS Development Team. All rights reserved. -# $Id$ - -include $(TOP)/config/make.cfg - -FILES := gui main patches setup locale -EXEDIR := $(AROS_UTILITIES) - -#MM- workbench-utilities : includes linklibs workbench-utilities-snoopy - -#MM workbench-utilities-snoopy : \ -#MM workbench-utilities-snoopy-catalogs \ -#MM workbench-utilities-snoopy-icons - -%build_prog mmake=workbench-utilities-snoopy \ - progname=Snoopy targetdir=$(EXEDIR) \ - files=$(FILES) uselibs="mui arossupport amiga" - -%common -- 2.11.4.GIT