github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix paths related to Development

This commit is contained in:
deadwood 2020-11-11 21:07:39 +01:00
parent 233b098958
commit 93e8bfaf7a
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/all-runtimelinux/boot/deb/libaxrt-2.0-dbg/mmakefile.src
View File

@ -35,7 +35,7 @@ runtime-setup-package-deb-libaxrt-2.0-dbg :
@$(CP) -r $(SRCDIR)/$(CURDIR)/DEBIAN/ $(DEST_ROOT_DIR)
@$(SED) -i "s/{RTVER}/$(RT_VERSION).$(RT_REVISION)/" $(DEST_ROOT_DIR)/DEBIAN/control
%mkdirs_q $(AXRT_DEST_DIR)
@$(CP) $(AROSDIR)/Developer/lib/libaxrt.so.dbg $(DEST_ROOT_DIR)/usr/lib/debug/usr/lib/x86_64-linux-gnu
@$(CP) $(AROS_DEVELOPMENT)/lib/libaxrt.so.dbg $(DEST_ROOT_DIR)/usr/lib/debug/usr/lib/x86_64-linux-gnu
runtime-package-deb-libaxrt-2.0-dbg : runtime-package-deb-libaxrt-2.0-dbg-build

2
arch/all-runtimelinux/boot/deb/libaxrt-2.0-dev/mmakefile.src
View File

@ -7,7 +7,7 @@ include $(SRCDIR)/config/aros.cfg
#MM runtime-package-deb-libaxrt-2.0-dev-includes \
#MM runtime-package-deb-libaxrt-2.0-dev-lib
SDK_SRC_DIR := $(AROSDIR)/Developer
SDK_SRC_DIR := $(AROS_DEVELOPMENT)
DEST_ROOT_DIR := $(GENDIR)/boot/libaxrt-2.0-dev
LIB_DEST_DIR := $(DEST_ROOT_DIR)/usr/lib/x86_64-linux-gnu
INCLUDE_DEST_DIR := $(DEST_ROOT_DIR)/usr/include/axrt

2
arch/all-runtimelinux/boot/deb/libaxrt-2.0/mmakefile.src
View File

@ -146,7 +146,7 @@ runtime-setup-package-deb-libaxrt-2.0 :
@$(SED) -i "s/{RTVER}/$(RT_VERSION).$(RT_REVISION)/" $(DEST_ROOT_DIR)/DEBIAN/control
%mkdirs_q $(AXRT_DEST_DIR) $(USERSYS_DEST_DIR) $(USERSYS_DEST_DIR)/Prefs/Env-Archive/SYS
%mkdirs_q $(USERSYS_DEST_DIR)/Prefs/Presets/Themes/pixblue $(USERSYS_DEST_DIR)/Fonts/TrueType $(USERSYS_DEST_DIR)/Fonts/ttcourier
@$(CP) $(AROSDIR)/Developer/lib/libaxrt.so $(DEST_ROOT_DIR)/usr/lib/x86_64-linux-gnu
@$(CP) $(AROS_DEVELOPMENT)/lib/libaxrt.so $(DEST_ROOT_DIR)/usr/lib/x86_64-linux-gnu
%mkdirs_q $(USERSYS_DEST_DIR)/Prefs/Env-Archive/SYS
@$(ECHO) $(RT_VERSION).$(RT_REVISION) > $(USERSYS_DEST_DIR)/Prefs/Env-Archive/SYS/USERSYSVER

2
config/make.tmpl
View File

@ -4230,7 +4230,7 @@ GNU_REPOSITORY := gnu://
%define fetch_and_build_gnu_development package=/A subpackage= version=/A crossbuild=no suffixes="tar.bz2 tar.gz" \
srcdir= package_repo= patch=no patch_repo= prefix=$(AROS_DEVELOPMENT) \
aros_prefix=/Developer config_env_extra= preconfigure= postconfigure= postinstall= \
aros_prefix=/Development config_env_extra= preconfigure= postconfigure= postinstall= \
extraoptions= \
usecppflags=yes extracppflags= \
usecflags=yes extracflags="$(OPTIMIZATION_CFLAGS)" \

2
images/IconSets/Mason/workbench/Developer/Debug/mmakefile.src
View File

@ -5,7 +5,7 @@
include $(SRCDIR)/config/aros.cfg
ICONS := Sashimi
ICONDIR := $(AROSDIR)/Developer/Debug
ICONDIR := $(AROS_DEVELOPMENT)/Debug
#MM- iconset-Mason-wbench-icons-aros : iconset-Mason-wbench-icons-aros-debug

2
images/IconSets/Mason/workbench/Developer/mmakefile.src
View File

@ -5,7 +5,7 @@
include $(SRCDIR)/config/aros.cfg
ICONS := Debug
ICONDIR := $(AROSDIR)/Developer
ICONDIR := $(AROS_DEVELOPMENT)
#MM- iconset-Mason-wbench-icons-aros : iconset-Mason-wbench-icons-aros-developer

8
scripts/snapshotports.sh
View File

@ -72,10 +72,10 @@ build()
echo "Copying the binaries"
mkdir "$bindir" -p
copy "$target" "Extras/Developer" "BWBasic"
copy "$target" "Extras/Developer" "CBMBasic"
copy "$target" "Extras/Developer" "CFlow"
copy "$target" "Extras/Developer" "Ctags"
copy "$target" "Extras/Development" "BWBasic"
copy "$target" "Extras/Development" "CBMBasic"
copy "$target" "Extras/Development" "CFlow"
copy "$target" "Extras/Development" "Ctags"
copy "$target" "Extras/Emu" "DOSBox"
copy "$target" "Extras/Emu" "Scummvm"
copy "$target" "Extras/Emu" "Vbam"

2
workbench/libs/identify/idfunction.c
View File

@ -278,7 +278,7 @@ static struct LibNode *loadFD(struct List *libList, CONST_STRPTR libname, struct
D(bug("[idfunction/loadFD] out of mem for filename\n"));
goto bailout;
}
sprintf(fileName, "Developer:fd/%s_lib.fd", libNameStripped);
sprintf(fileName, "Development:fd/%s_lib.fd", libNameStripped);
D(bug("[idfunction/loadFD] libnamestripped %s filename %s\n", libNameStripped, fileName));

2
workbench/tools/InstallAROS/ia_class.c
View File

@ -1589,7 +1589,7 @@ IPTR Install__MUIM_IC_Install(Class * CLASS, Object * self, Msg message)
developerpath);
/* Set Developer package var */
create_environment_variable(data->install_SysTarget, "SYS/Packages/Developer",
create_environment_variable(data->install_SysTarget, "SYS/Packages/Development",
developerpath);
/* Restore undo state */

2
workbench/tools/InstallAROS/ia_packages.c
View File

@ -32,7 +32,7 @@ void PACKAGES_AddCoreSkipPaths(struct List *SkipList)
#if (1) // Hard coded for now ...
strcpy(skipPath, source_Path);
AddPart(skipPath, "Prefs/Env-Archive/SYS/Packages/Developer", skipPathLen);
AddPart(skipPath, "Prefs/Env-Archive/SYS/Packages/Development", skipPathLen);
AddSkipListEntry(SkipList, skipPath);
#endif
// TODO: remove core package dirs ..