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

[DEVELOPMENT ENVIRONMENT]

Browse source 
* BUG: Pacakger: support for 'gb.gui.qt' and 'gb.gui.qt.webkit' generic
  components.


git-svn-id: svn://localhost/gambas/trunk@7525 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2015-12-15 01:50:27 +00:00
parent a5c770607d
commit adc0f772a2
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/gambas3/.src/Packager/Package.module
View file

@ -26,7 +26,7 @@ Private $sVersion As String
Private $sDescription As String
Private $sSavePath As String
Private $bSupportPackage As Boolean
Private $sSupportPackage As String
Private MIN_VERSION As String
Private Const MAX_VERSION As String = "3.99.0"
@ -38,9 +38,9 @@ Private $sFormatMinMax As String
Private $sFormatEqual As String
Private Const QT4_SUPPORT As String = "qt4"
Private QT4_SUPPORT_PACKAGES As String[] = ["gb.qt4:gb.gui", "gb.qt4.opengl:gb.gui.opengl"]
Private QT4_SUPPORT_PACKAGES As String[] = ["gb.qt4:gb.gui", "gb.qt4:gb.gui.qt", "gb.qt4.opengl:gb.gui.opengl", "gb.qt4.webkit:gb.gui.qt.webkit"]
Private Const QT5_SUPPORT As String = "qt5"
Private QT5_SUPPORT_PACKAGES As String[] = ["gb.qt5:gb.gui", "gb.qt5.opengl:gb.gui.opengl"]
Private QT5_SUPPORT_PACKAGES As String[] = ["gb.qt5:gb.gui", "gb.qt5:gb.gui.qt", "gb.qt5.opengl:gb.gui.opengl", "gb.qt5.webkit:gb.gui.qt.webkit"]
Private Const GTK_SUPPORT As String = "gtk"
Private GTK_SUPPORT_PACKAGES As String[] = ["gb.gtk:gb.gui", "gb.gtk.opengl:gb.gui.opengl"]
Private Const GTK3_SUPPORT As String = "gtk3"
@ -227,7 +227,13 @@ Private Sub InitMake(sSys As String)
$sDescription = "Missing description"
Endif
$bSupportPackage = Project.Components.Exist("gb.gui")
With Project.Components
If .Exist("gb.gui") Then
$sSupportPackage = "gb.gui"
Else If .Exist("gb.gui.qt") Then
$sSupportPackage = "gb.gui.qt"
Endif
End With
End
@ -625,16 +631,20 @@ Private Sub MakeSupportPackage(sSys As String)
Dim sSupport As String
Dim aPackage As String[]
sSupport = GTK_SUPPORT
aPackage = GTK_SUPPORT_PACKAGES
AddLog("\n============ " & Subst(("Making &1 support package..."), "GTK+"))
GoSub MAKE_PACKAGE
If Not Project.Components.Exist("gb.gui.opengl") Then
sSupport = GTK3_SUPPORT
aPackage = GTK3_SUPPORT_PACKAGES
AddLog("\n============ " & Subst(("Making &1 support package..."), "GTK+3"))
If $sSupportPackage = "gb.gui" Then
sSupport = GTK_SUPPORT
aPackage = GTK_SUPPORT_PACKAGES
AddLog("\n============ " & Subst(("Making &1 support package..."), "GTK+"))
GoSub MAKE_PACKAGE
If Not Project.Components.Exist("gb.gui.opengl") Then
sSupport = GTK3_SUPPORT
aPackage = GTK3_SUPPORT_PACKAGES
AddLog("\n============ " & Subst(("Making &1 support package..."), "GTK+3"))
GoSub MAKE_PACKAGE
Endif
Endif
sSupport = QT4_SUPPORT
@ -704,7 +714,7 @@ Private Function MakePackage(sSys As String) As Boolean
End Select
If $bSupportPackage Then MakeSupportPackage(sSys)
If $sSupportPackage Then MakeSupportPackage(sSys)
Catch