From ace44916a2e705ba5f41001e932e8039d9dd9b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Fri, 2 Jan 2015 11:55:00 +0000 Subject: [PATCH] [CONFIGURATION] * NEW: When installing a component entirely written in Gambas, automatically remove possible existing old shared library files. [DEVELOPMENT ENVIRONMENT] * NEW: Don't display an error message when a newly inserted file cannot be automatically opened. git-svn-id: svn://localhost/gambas/trunk@6794 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.src/Project/FCreateFile.class | 8 +++++++- comp/Makefile.am | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/gambas3/.src/Project/FCreateFile.class b/app/src/gambas3/.src/Project/FCreateFile.class index eaf39d361..bffbaf314 100644 --- a/app/src/gambas3/.src/Project/FCreateFile.class +++ b/app/src/gambas3/.src/Project/FCreateFile.class @@ -319,7 +319,9 @@ Private Sub CreateFile() As Boolean Case "text" File.Save($sDir &/ sName, "") + Inc FMain.NoMessage Project.InsertFile(sName, $sDir) + Dec FMain.NoMessage Case "html" @@ -456,9 +458,12 @@ Private Sub ImportFile() As Boolean Project.InsertSource(sName, "class", $sDir, File.SetExt(sTemp, "class"), True, True, chkLink.Value) Project.InsertSource(sName, "webpage", $sDir, sTemp, False, False, chkLink.Value) - Default + Case Else + + Inc FMain.NoMessage sName = Project.GetUniqueName($sDir, sName) Project.InsertFile(sName, $sDir, sTemp,, chkLink.Value) + Dec FMain.NoMessage End Select @@ -480,6 +485,7 @@ Public Sub btnOK_Click() Catch + FMain.NoMessage = 0 FMain.ShowError(("Cannot add file.") & "\n\n" & Error.Text & "\n" & Error.Where) End diff --git a/comp/Makefile.am b/comp/Makefile.am index a920fd592..49f7d7f42 100644 --- a/comp/Makefile.am +++ b/comp/Makefile.am @@ -19,6 +19,7 @@ install-exec-local: $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ rm -rf .gambas; \ echo "Installing $$p..."; \ + rm -f $(DESTDIR)$(gblibdir)/$$p.so $(DESTDIR)$(gblibdir)/$$p.so.* $(DESTDIR)$(gblibdir)/$$p.la \ $(INSTALL) $$p.gambas $(DESTDIR)$(gblibdir); \ $(INSTALL) .component $(DESTDIR)$(gblibdir)/$$p.component; \ chmod a-x $(DESTDIR)$(gblibdir)/$$p.component; \