luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[INTERPRETER]

Browse source 
* NEW: Loading a library does not load its dependencies automatically 
  anymore. Now they behave like components, and the IDE will have to
  compute the dependencies.


git-svn-id: svn://localhost/gambas/trunk@4463 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-02-08 20:26:24 +00:00
parent 227a73b645
commit b075a2e026
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main/gbx/gbx_archive.c
View file

@ -149,7 +149,7 @@ static void load_component(char *name)
COMPONENT_load(comp);
}
static void load_dependencies(ARCHIVE *arch)
/*static void load_dependencies(ARCHIVE *arch)
{
char *buffer;
int len;
@ -157,14 +157,14 @@ static void load_dependencies(ARCHIVE *arch)
STREAM_load(".startup", &buffer, &len);
PROJECT_analyze_startup(buffer, len, load_component);
FREE(&buffer, "load_dependencies");
}
}*/
static void load_archive(ARCHIVE *arch, const char *path, bool dep)
static void load_archive(ARCHIVE *arch, const char *path) //, bool dep)
{
arch->arch = ARCH_open(path);
load_exported_class(arch);
if (dep)
load_dependencies(arch);
//if (dep)
// load_dependencies(arch);
}
static char *exist_library(const char *dir, const char *name)
@ -178,7 +178,7 @@ static char *exist_library(const char *dir, const char *name)
return NULL;
}
void ARCHIVE_load(ARCHIVE *arch, bool dep)
void ARCHIVE_load(ARCHIVE *arch) //, bool dep)
{
char *path;
@ -202,7 +202,7 @@ void ARCHIVE_load(ARCHIVE *arch, bool dep)
sprintf(path, ARCH_PATTERN, COMPONENT_path, arch->name);
}
load_archive(arch, path, dep);
load_archive(arch, path); //, dep);
}

2
main/gbx/gbx_archive.h
View file

@ -65,7 +65,7 @@ void ARCHIVE_load_main(void);
ARCHIVE *ARCHIVE_create(const char *name, const char *path);
void ARCHIVE_delete(ARCHIVE *arch);
void ARCHIVE_load(ARCHIVE *arch, bool dep);
void ARCHIVE_load(ARCHIVE *arch);
bool ARCHIVE_get(ARCHIVE *arch, const char **ppath, ARCHIVE_FIND *find);

2
main/gbx/gbx_component.c
View file

@ -263,7 +263,7 @@ void COMPONENT_load(COMPONENT *comp)
}
if (comp->archive)
ARCHIVE_load(comp->archive, comp->user);
ARCHIVE_load(comp->archive);
comp->loading = FALSE;
comp->loaded = TRUE;