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

Fix packager creates component name with leading dot

Browse Source 
this happend if vendorname = Null
This commit is contained in:
christof 2019-01-21 14:54:34 +01:00
parent 75b1d5955a
commit 4dae37d474
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/gambas3/.src/Packager/Package.module
View File

@ -206,32 +206,34 @@ Private Sub InitMake(sSys As String)
$sName = Project.Name $sName = Project.Name
$sComponentName = $sName $sComponentName = $sName
$sVendor = Project.Vendor $sVendor = Project.Vendor
$sVendorPrefix = Project.VendorPrefix $sVendorPrefix = Project.VendorPrefix
If Not $sVendorPrefix Then $sVendorPrefix = $sVendor If Not $sVendorPrefix Then $sVendorPrefix = $sVendor
If Project.Type = Project.TYPE_COMPONENT Then If Project.Type = Project.TYPE_COMPONENT Then
If $sName Not Begins $sVendorPrefix & "." Then $sComponentName = $sVendorPrefix & "." & $sName If $sVendorPrefix <> Null Then
If $sName Not Begins $sVendorPrefix & "." Then $sComponentName = $sVendorPrefix & "." & $sName
Endif
$sComponentName = String.LCase($sComponentName) $sComponentName = String.LCase($sComponentName)
Else If Project.Type = Project.TYPE_LIBRARY Then Else If Project.Type = Project.TYPE_LIBRARY Then
$sLibraryName = $sName & ":" & Project.MajorVersion & "." & Project.MinorVersion $sLibraryName = $sName & ":" & Project.MajorVersion & "." & Project.MinorVersion
Endif Endif
'$sPrefix = GetPackagePrefix(Project.Vendor, Project.Prefix) '$sPrefix = GetPackagePrefix(Project.Vendor, Project.Prefix)
$sUnsafePackageName = GetPackageFullName($sVendor, $sVendorPrefix, Project.Prefix, False) $sUnsafePackageName = GetPackageFullName($sVendor, $sVendorPrefix, Project.Prefix, False)
$sHome = System.User.Home $sHome = System.User.Home
$sCategories = Project.Categories[sSys] $sCategories = Project.Categories[sSys]
If $sCategories Then $sCategories &= ";" If $sCategories Then $sCategories &= ";"
$sVersion = GetVersion() $sVersion = GetVersion()
If Project.Description Then If Project.Description Then
$sDescription = RemoveEmptyLines(Project.Description) $sDescription = RemoveEmptyLines(Project.Description)
Else Else
$sDescription = "Missing description" $sDescription = "Missing description"
Endif Endif
With Project.Components With Project.Components
If .Exist("gb.gui") Then If .Exist("gb.gui") Then
$sSupportPackage = "gb.gui" $sSupportPackage = "gb.gui"