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

Packager: Try to fix how license is registered in ArchLinux packages.

Browse source 
[DEVELOPMENT ENVIRONMENT]
* NEW: Packager: Add more GPL licenses.
* BUG: Packager: Try to fix how license is registered in ArchLinux packages.
This commit is contained in:
gambas 2021-12-11 12:36:42 +01:00
parent f19a9b7494
commit 93613f517a
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/gambas3/.src/Packager/FMakeInstall.class
View file

@ -128,7 +128,7 @@ Public Sub Form_Open()
cmbCategories.List = Split(File.Load("install/categories"), "\n", "", True) cmbCategories.List = Split(File.Load("install/categories"), "\n", "", True)
txtLicense.List = ["General Public License", "Freeware", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-Free License"] 'txtLicense.List = ["General Public License", "Freeware", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-Free License"]
chkCreateDir.Value = Project.CreateEachDirectory chkCreateDir.Value = Project.CreateEachDirectory

2
app/src/gambas3/.src/Packager/FMakeInstall.form
View file

@ -171,7 +171,7 @@
MoveScaled(25,0,46,4) MoveScaled(25,0,46,4)
#Translate = False #Translate = False
Expand = True Expand = True
List = ["General Public License", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-free License"] List = ["General Public License", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-free License", "General Public License V2 only", "Lesser General Public License V2 only", "General Public License V3", "Lesser General Public License V3", "General Public License V2 or any later version", "Lesser General Public License V2 or any later version"]
Sorted = True Sorted = True
} }
} }

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

@ -2316,7 +2316,7 @@ Private Sub MakeAutotoolsPackage((sSys) As String)
File.Save(sBuildDir &/ "ChangeLog", ChangeLog) File.Save(sBuildDir &/ "ChangeLog", ChangeLog)
File.Save(sBuildDir &/ "AUTHORS", Project.Maintainer & " <" & Project.Address & ">") File.Save(sBuildDir &/ "AUTHORS", Project.Maintainer & " <" & Project.Address & ">")
File.Save(sBuildDir &/ "README", Project.Description) File.Save(sBuildDir &/ "README", Project.Description)
File.Save(sBuilddir &/ "COPYING", "This program is under : " & Project.License) File.Save(sBuilddir &/ "COPYING", "This program is under: " & Project.License)
File.Save(sBuilddir &/ "NEWS", "") File.Save(sBuilddir &/ "NEWS", "")
hFile = Open sBuildDir &/ "configure.ac" For Create hFile = Open sBuildDir &/ "configure.ac" For Create
@ -2381,7 +2381,6 @@ Private Function MakeArchPackage(sSys As String)
Dim sDependencies As String Dim sDependencies As String
Dim sPkgDesc As String Dim sPkgDesc As String
Dim sPackageName As String Dim sPackageName As String
Dim sLicence As String
Inc Application.Busy Inc Application.Busy
@ -2411,7 +2410,7 @@ Private Function MakeArchPackage(sSys As String)
sPkgTgz = $sName & "-" & $sVersion & ".tar.bz2" sPkgTgz = $sName & "-" & $sVersion & ".tar.bz2"
Project.MakeSourcePackageTo(sBuildDir &/ sPkgTgz) Project.MakeSourcePackageTo(sBuildDir &/ sPkgTgz)
File.Save(sBuilddir &/ "license.txt", "This program is under : " & Project.License) File.Save(sBuilddir &/ "license.txt", "This program is under: " & Project.License)
If Project.Type = Project.TYPE_NORMAL Then If Project.Type = Project.TYPE_NORMAL Then
@ -2445,17 +2444,7 @@ Private Function MakeArchPackage(sSys As String)
' Other License(s) ' Other License(s)
' Non-free License ' Non-free License
Select Case Package.Licence Print #hFile, "license=('custom:" & Project.License & "')"
Case "General Public License"
sLicence = "GPL"
Case Else
sLicence = "custom:" & Package.Licence
End Select
Print #hFile, "license=('" & sLicence & "')"
If Len(sDependencies) > 0 Then If Len(sDependencies) > 0 Then
Print #hFile, "depends=(" & Left$(sDependencies, -1) & ")" Print #hFile, "depends=(" & Left$(sDependencies, -1) & ")"
Endif Endif
@ -2522,7 +2511,7 @@ Private Function MakeArchPackage(sSys As String)
Print #hFile, GetExtraFilesDir(sSys, " install -d ${pkgdir}&1"); Print #hFile, GetExtraFilesDir(sSys, " install -d ${pkgdir}&1");
Print #hFile, GetExtraFiles(sSys, " install -p ${srcdir}/${_realname}/.hidden/&1 ${pkgdir}&2/&1", " cp -R --preserve=timestamp ${srcdir}/${_realname}/.hidden/&1 ${pkgdir}&2/&1"); Print #hFile, GetExtraFiles(sSys, " install -p ${srcdir}/${_realname}/.hidden/&1 ${pkgdir}&2/&1", " cp -R --preserve=timestamp ${srcdir}/${_realname}/.hidden/&1 ${pkgdir}&2/&1");
Print #hFile, " install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses" &/ sPackageName &/ "license.txt" Print #hFile, " install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses" &/ sPackageName &/ "LICENSE"
Print #hFile, "}" Print #hFile, "}"
Close #hFile Close #hFile
@ -2581,7 +2570,7 @@ Private Function MakeArchSupportPackage((sSys) As String, sSupport As String, aC
' 2. Copy needed files ' 2. Copy needed files
File.Save(sBuilddir &/ "license.txt", "This program is under : " & Project.License) File.Save(sBuilddir &/ "license.txt", "This program is under: " & Project.License)
hFile = Open sBuildDir &/ "PKGBUILD" For Create hFile = Open sBuildDir &/ "PKGBUILD" For Create
Print #hFile, "# generated by the gambas3 ide" Print #hFile, "# generated by the gambas3 ide"