[DEVELOPMENT ENVIRONMENT]

* NEW: Store package name in the .project file.
* NEW: Take libraries into account in package dependencies.
* BUG: Fix autotools packages. Components are now stored beside the 
  "Component=" entry in the .project file. The "Library=" entry is for 
  libraries!

[ARCHIVER]
* NEW: Stores the .project file into executables.


git-svn-id: svn://localhost/gambas/trunk@3036 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-07-11 23:13:11 +00:00
parent 46234d8dc7
commit 6a680716a9
18 changed files with 4684 additions and 4902 deletions

View File

@ -34,7 +34,7 @@ msgstr ""
msgid "Implements"
msgstr ""
#: CComponentBox.class:233 LibraryItem.class:56
#: CComponentBox.class:233 LibraryItem.class:58
msgid "Provides"
msgstr ""
@ -308,19 +308,19 @@ msgid "Gambas reports"
msgstr ""
#: CProjectTree.class:290 FMain.class:2681 FSearch.class:89
#: FSelectIcon.class:216 Project.module:1305
#: FSelectIcon.class:216 Project.module:1306
msgid "Project"
msgstr ""
#: CProjectTree.class:293 Project.module:1308
#: CProjectTree.class:293 Project.module:1309
msgid "Sources"
msgstr ""
#: CProjectTree.class:296 Project.module:1311
#: CProjectTree.class:296 Project.module:1312
msgid "Connections"
msgstr ""
#: CProjectTree.class:305 Project.module:1320
#: CProjectTree.class:305 Project.module:1321
msgid "Data"
msgstr ""
@ -350,7 +350,7 @@ msgid ""
"the GNU General Public License."
msgstr ""
#: Design.module:216 Project.module:1757
#: Design.module:216 Project.module:1758
msgid "In class &1 at line &2."
msgstr ""
@ -457,7 +457,7 @@ msgstr ""
#: FEditor.class:2237 FFindList.class:195 FFontChooser.class:85
#: FForm.class:2955 FGotoLine.class:63 FHelpBrowser.class:275
#: FIconEditor.class:1396 FImportTable.class:38 FList.class:155
#: FMain.class:211 FMakeExecutable.class:144 FMakeInstall.class:309
#: FMain.class:211 FMakeExecutable.class:144 FMakeInstall.class:310
#: FMenu.class:1070 FNewConnection.class:317 FNewTable.class:165
#: FNewTranslation.class:70 FOpenProject.class:479 FOption.class:590
#: FPasteSpecial.class:279 FPropertyProject.class:1017
@ -465,7 +465,7 @@ msgstr ""
#: FSave.class:118 FSearch.class:472 FSelectExtraFile.class:78
#: FSelectIcon.class:272 FSnippet.class:142 FTableChooser.class:144
#: FTextEditor.class:450 FText.class:106 FTranslate.class:617
#: Project.module:368
#: Project.module:369
msgid "Cancel"
msgstr ""
@ -485,7 +485,7 @@ msgstr ""
msgid "Project commit"
msgstr ""
#: FCommit.class:195 FMakeInstall.class:1268 FPropertyProject.class:1531
#: FCommit.class:195 FMakeInstall.class:1269 FPropertyProject.class:1531
msgid "Description"
msgstr ""
@ -607,7 +607,7 @@ msgid ""
"Do you really want to open another file?"
msgstr ""
#: FConflict.class:254 FOpenProject.class:384 Project.module:368
#: FConflict.class:254 FOpenProject.class:384 Project.module:369
msgid "Open"
msgstr ""
@ -796,7 +796,7 @@ msgstr ""
msgid "Do you really want to remove the selected rows?"
msgstr ""
#: FConnectionEditor.class:1400 FMakeInstall.class:933
#: FConnectionEditor.class:1400 FMakeInstall.class:934
msgid "Remove"
msgstr ""
@ -1188,7 +1188,7 @@ msgstr ""
msgid "Add expression"
msgstr ""
#: FDebugInfo.class:1078 FMakeInstall.class:1539 FPropertyProject.class:2054
#: FDebugInfo.class:1078 FMakeInstall.class:1540 FPropertyProject.class:2054
msgid "&Add"
msgstr ""
@ -1196,7 +1196,7 @@ msgstr ""
msgid "Remove current expression"
msgstr ""
#: FDebugInfo.class:1086 FMain.class:2523 FMakeInstall.class:1545
#: FDebugInfo.class:1086 FMain.class:2523 FMakeInstall.class:1546
#: FOption.class:1521 FPropertyProject.class:1825
msgid "&Remove"
msgstr ""
@ -1933,11 +1933,11 @@ msgstr ""
msgid "&Delete"
msgstr ""
#: FList.class:286 FMakeInstall.class:1551
#: FList.class:286 FMakeInstall.class:1552
msgid "&Up"
msgstr ""
#: FList.class:292 FMakeInstall.class:1557
#: FList.class:292 FMakeInstall.class:1558
msgid "&Down"
msgstr ""
@ -2305,7 +2305,7 @@ msgstr ""
msgid "Save project"
msgstr ""
#: FMain.class:2604 Project.module:2060
#: FMain.class:2604 Project.module:2061
msgid "Save project as"
msgstr ""
@ -2337,7 +2337,7 @@ msgstr ""
msgid "Make executable"
msgstr ""
#: FMain.class:2669 FMakeInstall.class:1168
#: FMain.class:2669 FMakeInstall.class:1169
msgid "Make installation package"
msgstr ""
@ -2453,7 +2453,7 @@ msgstr ""
msgid "Destination directory"
msgstr ""
#: FMakeInstall.class:260 Package.module:178
#: FMakeInstall.class:260 Package.module:183
msgid "The packages have been successfully created."
msgstr ""
@ -2469,223 +2469,223 @@ msgstr ""
msgid "Please enter your e-mail address."
msgstr ""
#: FMakeInstall.class:309
#: FMakeInstall.class:310
msgid "There is no CHANGELOG entry for this release."
msgstr ""
#: FMakeInstall.class:309 FPropertyProject.class:1017 FSave.class:111
#: Project.module:2764
#: FMakeInstall.class:310 FPropertyProject.class:1017 FSave.class:111
#: Project.module:2769
msgid "Continue"
msgstr ""
#: FMakeInstall.class:316
#: FMakeInstall.class:317
msgid "Please enter the first CHANGELOG entry."
msgstr ""
#: FMakeInstall.class:326
#: FMakeInstall.class:327
msgid "Please choose at least one target distribution."
msgstr ""
#: FMakeInstall.class:348
#: FMakeInstall.class:349
msgid "Please choose the package group for each target distribution."
msgstr ""
#: FMakeInstall.class:350
#: FMakeInstall.class:351
msgid "Please choose a package group."
msgstr ""
#: FMakeInstall.class:359
#: FMakeInstall.class:360
msgid "Please choose the menu location for each target distribution."
msgstr ""
#: FMakeInstall.class:361
#: FMakeInstall.class:362
msgid "Please choose a menu location."
msgstr ""
#: FMakeInstall.class:387
#: FMakeInstall.class:388
msgid "The package cannot be stored inside the project directory."
msgstr ""
#: FMakeInstall.class:425
#: FMakeInstall.class:426
msgid "Initial release"
msgstr ""
#: FMakeInstall.class:669
#: FMakeInstall.class:670
msgid "Menus"
msgstr ""
#: FMakeInstall.class:737
#: FMakeInstall.class:738
msgid "Groups"
msgstr ""
#: FMakeInstall.class:861
#: FMakeInstall.class:862
msgid "Incorrect characters"
msgstr ""
#: FMakeInstall.class:933
#: FMakeInstall.class:934
msgid "Do you really want to remove all extra dependencies?"
msgstr ""
#: FMakeInstall.class:982
#: FMakeInstall.class:983
msgid "Select the destination directory"
msgstr ""
#: FMakeInstall.class:1056
#: FMakeInstall.class:1057
msgid "Do you really want to remove all extra files?"
msgstr ""
#: FMakeInstall.class:1181
#: FMakeInstall.class:1182
msgid "Package information"
msgstr ""
#: FMakeInstall.class:1187
#: FMakeInstall.class:1188
msgid "Package name"
msgstr ""
#: FMakeInstall.class:1203
#: FMakeInstall.class:1204
msgid "Prefix package name with the vendor name"
msgstr ""
#: FMakeInstall.class:1208
#: FMakeInstall.class:1209
msgid "Insert release number in package version"
msgstr ""
#: FMakeInstall.class:1216
#: FMakeInstall.class:1217
msgid "Maintainer information"
msgstr ""
#: FMakeInstall.class:1226
#: FMakeInstall.class:1227
msgid "Your name"
msgstr ""
#: FMakeInstall.class:1241
#: FMakeInstall.class:1242
msgid "Your e-mail address"
msgstr ""
#: FMakeInstall.class:1256
#: FMakeInstall.class:1257
msgid "Vendor name"
msgstr ""
#: FMakeInstall.class:1281
#: FMakeInstall.class:1282
msgid "License"
msgstr ""
#: FMakeInstall.class:1287
#: FMakeInstall.class:1288
msgid "General Public License"
msgstr ""
#: FMakeInstall.class:1287
#: FMakeInstall.class:1288
msgid "Freeware"
msgstr ""
#: FMakeInstall.class:1287
#: FMakeInstall.class:1288
msgid "Public Domain"
msgstr ""
#: FMakeInstall.class:1287
#: FMakeInstall.class:1288
msgid "Lesser General Public License"
msgstr ""
#: FMakeInstall.class:1287
#: FMakeInstall.class:1288
msgid "Other License(s)"
msgstr ""
#: FMakeInstall.class:1287
#: FMakeInstall.class:1288
msgid "Non-free License"
msgstr ""
#: FMakeInstall.class:1291
#: FMakeInstall.class:1292
msgid "Changelog"
msgstr ""
#: FMakeInstall.class:1296
#: FMakeInstall.class:1297
msgid "Please enter the changes of your project."
msgstr ""
#: FMakeInstall.class:1317
#: FMakeInstall.class:1318
msgid "Target distribution"
msgstr ""
#: FMakeInstall.class:1339
#: FMakeInstall.class:1340
msgid "Debian"
msgstr ""
#: FMakeInstall.class:1358
#: FMakeInstall.class:1359
msgid "Fedora"
msgstr ""
#: FMakeInstall.class:1377
#: FMakeInstall.class:1378
msgid "Mandriva Linux"
msgstr ""
#: FMakeInstall.class:1396
#: FMakeInstall.class:1397
msgid "OpenSUSE"
msgstr ""
#: FMakeInstall.class:1415
#: FMakeInstall.class:1416
msgid "Slackware"
msgstr ""
#: FMakeInstall.class:1434
#: FMakeInstall.class:1435
msgid "Ubuntu"
msgstr ""
#: FMakeInstall.class:1453
#: FMakeInstall.class:1454
msgid "Autotools"
msgstr ""
#: FMakeInstall.class:1458
#: FMakeInstall.class:1459
msgid "Package group"
msgstr ""
#: FMakeInstall.class:1478
#: FMakeInstall.class:1479
msgid "Menu entry"
msgstr ""
#: FMakeInstall.class:1500
#: FMakeInstall.class:1501
msgid "Categories"
msgstr ""
#: FMakeInstall.class:1509
#: FMakeInstall.class:1510
msgid "Extra dependencies"
msgstr ""
#: FMakeInstall.class:1513
#: FMakeInstall.class:1514
msgid "Same dependencies for all targets"
msgstr ""
#: FMakeInstall.class:1563
#: FMakeInstall.class:1564
msgid "&Clear"
msgstr ""
#: FMakeInstall.class:1569
#: FMakeInstall.class:1570
msgid "Extra files"
msgstr ""
#: FMakeInstall.class:1573
#: FMakeInstall.class:1574
msgid "Same files for all targets"
msgstr ""
#: FMakeInstall.class:1630
#: FMakeInstall.class:1631
msgid "Extra autoconf tests"
msgstr ""
#: FMakeInstall.class:1635
#: FMakeInstall.class:1636
msgid ""
"Add extra tests for the configuration process.\n"
"<p><b>Leave this blank if you don't need it, or if you don't know anything "
"about <i>autoconf</i> scripts.</b>"
msgstr ""
#: FMakeInstall.class:1653
#: FMakeInstall.class:1654
msgid "Create directories for each distribution"
msgstr ""
#: FMakeInstall.class:1656
#: FMakeInstall.class:1657
msgid "Create package"
msgstr ""
#: FMakeInstall.class:1661
#: FMakeInstall.class:1662
msgid ""
"All needed information have been collected. You can now create the "
"installation packages for your application...\n"
@ -2811,7 +2811,7 @@ msgstr ""
msgid "Path"
msgstr ""
#: FNewConnection.class:501 Project.module:151
#: FNewConnection.class:501 Project.module:152
msgid "Database"
msgstr ""
@ -4012,6 +4012,10 @@ msgstr ""
msgid "Unknown"
msgstr ""
#: LibraryItem.class:57
msgid "Location"
msgstr ""
#: MConnection.module:285
msgid "Cannot create table '&1'."
msgstr ""
@ -4874,63 +4878,63 @@ msgstr ""
msgid "Errors"
msgstr ""
#: Package.module:55
#: Package.module:60
msgid "'&1' is missing."
msgstr ""
#: Package.module:64
#: Package.module:69
msgid "'&1' and '&2' are missing."
msgstr ""
#: Package.module:160
#: Package.module:165
msgid "Saving CHANGELOG file."
msgstr ""
#: Package.module:396
#: Package.module:416
msgid "Creating package for &1."
msgstr ""
#: Package.module:421
#: Package.module:441
msgid "The package build has failed."
msgstr ""
#: Package.module:451
#: Package.module:476
msgid "Making build directory."
msgstr ""
#: Package.module:472
#: Package.module:497
msgid "Creating desktop file..."
msgstr ""
#: Package.module:502
#: Package.module:527
msgid "Sources are being debianizated."
msgstr ""
#: Package.module:646
#: Package.module:673
msgid "Creating package..."
msgstr ""
#: Package.module:649
#: Package.module:676
msgid "'dpkg-buildpackage' has failed."
msgstr ""
#: Package.module:741
#: Package.module:773
msgid "Initializing ~/RPM directory."
msgstr ""
#: Package.module:761
#: Package.module:793
msgid "Creating source package."
msgstr ""
#: Package.module:785
#: Package.module:817
msgid "Creating .spec file."
msgstr ""
#: Package.module:1067
#: Package.module:1100
msgid "'rpmbuild' has returned the following error code:"
msgstr ""
#: Package.module:1300
#: Package.module:1339
msgid "'tar' has returned the following error code:"
msgstr ""
@ -4946,292 +4950,292 @@ msgstr ""
msgid "Integrated Development Environment for Gambas"
msgstr ""
#: Project.module:149
#: Project.module:150
msgid "Automation"
msgstr ""
#: Project.module:150
#: Project.module:151
msgid "Basic"
msgstr ""
#: Project.module:152
#: Project.module:153
msgid "Drawing"
msgstr ""
#: Project.module:153
#: Project.module:154
msgid "Games"
msgstr ""
#: Project.module:154
#: Project.module:155
msgid "Miscellaneous"
msgstr ""
#: Project.module:155
#: Project.module:156
msgid "Networking"
msgstr ""
#: Project.module:156
#: Project.module:157
msgid "OpenGL"
msgstr ""
#: Project.module:157
#: Project.module:158
msgid "Printing"
msgstr ""
#: Project.module:158
#: Project.module:159
msgid "Sound"
msgstr ""
#: Project.module:159
#: Project.module:160
msgid "Video"
msgstr ""
#: Project.module:160
#: Project.module:161
msgid "Controls"
msgstr ""
#: Project.module:351
#: Project.module:352
msgid "This project does not exist."
msgstr ""
#: Project.module:366
#: Project.module:367
msgid "This is not a Gambas project."
msgstr ""
#: Project.module:368
#: Project.module:369
msgid ""
"This is a Gambas &1 project.\n"
"\n"
"Do you want to open it anyway?"
msgstr ""
#: Project.module:379
#: Project.module:380
msgid ""
"This project seems to be already opened.\n"
"\n"
"Opening the same project twice can lead to data loss."
msgstr ""
#: Project.module:379
#: Project.module:380
msgid "Open after all"
msgstr ""
#: Project.module:379
#: Project.module:380
msgid "Do not open"
msgstr ""
#: Project.module:402
#: Project.module:403
msgid "This project is read-only."
msgstr ""
#: Project.module:402
#: Project.module:403
msgid "It cannot be converted."
msgstr ""
#: Project.module:455
#: Project.module:456
msgid "Cannot open project file :\n"
msgstr ""
#: Project.module:1106
#: Project.module:1107
msgid "The following classes have circular inheritance:"
msgstr ""
#: Project.module:1268
#: Project.module:1269
msgid "read-only"
msgstr ""
#: Project.module:1270
#: Project.module:1271
msgid "ALPHA VERSION, USE AT YOUR OWN RISK! :-)"
msgstr ""
#: Project.module:1456
#: Project.module:1457
msgid "Loading &1..."
msgstr ""
#: Project.module:1505
#: Project.module:1506
msgid "Cannot open a binary file."
msgstr ""
#: Project.module:1538
#: Project.module:1539
msgid "Cannot open file."
msgstr ""
#: Project.module:1597
#: Project.module:1598
msgid "File not found!"
msgstr ""
#: Project.module:1702
#: Project.module:1703
msgid "first"
msgstr ""
#: Project.module:1704
#: Project.module:1705
msgid "second"
msgstr ""
#: Project.module:1706
#: Project.module:1707
msgid "third"
msgstr ""
#: Project.module:1708
#: Project.module:1709
msgid "&1th"
msgstr ""
#: Project.module:1753
#: Project.module:1754
msgid "in form definition"
msgstr ""
#: Project.module:1911
#: Project.module:1912
msgid ""
"Some project source files are in conflict.\n"
"Please solve them if you want to compile the project."
msgstr ""
#: Project.module:1915
#: Project.module:1916
msgid "Compiling project"
msgstr ""
#: Project.module:1927
#: Project.module:1928
msgid "Nothing to do."
msgstr ""
#: Project.module:2066
#: Project.module:2067
msgid "This project already exists."
msgstr ""
#: Project.module:2079
#: Project.module:2080
msgid "Unable to save the project."
msgstr ""
#: Project.module:2152
#: Project.module:2153
msgid "File already exists."
msgstr ""
#: Project.module:2186
#: Project.module:2187
msgid "Directory already exists."
msgstr ""
#: Project.module:2198
#: Project.module:2199
msgid "Cannot link template file."
msgstr ""
#: Project.module:2204
#: Project.module:2205
msgid "Cannot copy template file."
msgstr ""
#: Project.module:2380
#: Project.module:2381
msgid "Making executable..."
msgstr ""
#: Project.module:2424
#: Project.module:2425
msgid "Cannot make executable."
msgstr ""
#: Project.module:2763
#: Project.module:2768
msgid "Some components are missing: &1"
msgstr ""
#: Project.module:2968
#: Project.module:2974
msgid "Cannot write project file."
msgstr ""
#: Project.module:3001
#: Project.module:3007
msgid "Unable to create desktop shortcut."
msgstr ""
#: Project.module:3263
#: Project.module:3269
msgid "The directory will be removed at the next commit."
msgstr ""
#: Project.module:3282
#: Project.module:3288
msgid "You must define a startup class or form!"
msgstr ""
#: Project.module:3314
#: Project.module:3320
msgid "Please type a name."
msgstr ""
#: Project.module:3318
#: Project.module:3324
msgid "This name contains a forbidden character:"
msgstr ""
#: Project.module:3322
#: Project.module:3328
msgid "The name cannot begins with a dot."
msgstr ""
#: Project.module:3326
#: Project.module:3332
msgid "This name is already used. Choose another one."
msgstr ""
#: Project.module:3357
#: Project.module:3363
msgid ""
"A class name must begin with a letter or an underscore, followed by any "
"letter or digit."
msgstr ""
#: Project.module:3405
#: Project.module:3411
msgid "Destination already exists"
msgstr ""
#: Project.module:3607
#: Project.module:3613
msgid "Unable to rename '&1'"
msgstr ""
#: Project.module:3729
#: Project.module:3735
msgid "Please type a project name."
msgstr ""
#: Project.module:3737
#: Project.module:3743
msgid "The project name cannot begin with a dot."
msgstr ""
#: Project.module:3740
#: Project.module:3746
msgid "Non-ASCII characters are forbidden in a project name."
msgstr ""
#: Project.module:3741
#: Project.module:3747
msgid ""
"The following characters are forbidden in a project name: ? * / \\ SPACE"
msgstr ""
#: Project.module:3751
#: Project.module:3757
msgid "The project directory already exists."
msgstr ""
#: Project.module:3753
#: Project.module:3759
msgid ""
"The project directory cannot be created because a file with the same name "
"already exists."
msgstr ""
#: Project.module:3799
#: Project.module:3805
msgid "Create source package"
msgstr ""
#: Project.module:3800
#: Project.module:3806
msgid "Source packages"
msgstr ""
#: Project.module:4077
#: Project.module:4083
msgid "Cannot copy file &1."
msgstr ""
#: Project.module:4126
#: Project.module:4132
msgid "Cannot create link &1."
msgstr ""
#: Project.module:4143
#: Project.module:4149
msgid "Cannot move a directory inside itself."
msgstr ""
#: Project.module:4207
#: Project.module:4213
msgid "Cannot move file &1."
msgstr ""
#: Project.module:4754
#: Project.module:4760
msgid "modified"
msgstr ""
#: Project.module:4834
#: Project.module:4840
msgid "Unable to update all forms."
msgstr ""

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -28,11 +28,11 @@ Language=en
KeepDebugInfo=1
Maintainer=gambas
Address=gambas@users.sourceforge.net
License=General Public Licence
Systems=slackware,autotools
Menus=Audio Video/Audio Video Editing,
Categories=AudioVideo;AudioVideoEditing,
Groups=Applications,
ExtraDependencies=,
ExtraFiles=CHANGELOG:,
License=General Public License
Systems=mandriva,slackware,autotools
Menus=Office/Accessories,Audio Video/Audio Video Editing,
Categories=Office;Utility,AudioVideo;AudioVideoEditing,
Groups=Accessibility,Applications,
ExtraDependencies=,,
ExtraFiles=,CHANGELOG:,
ExtraAutoconfTest="\n"

View File

@ -303,6 +303,7 @@ Public Sub wizInstall_BeforeChange()
Project.Description = txtDescribe.Text
Project.Prefix = chkPrefix.Value
Project.UseRelease = chkUseRelease.Value
Project.PackageName = txtPackage.Text
Case 1
If Not Trim(txtChange.Text) Then

View File

@ -25,6 +25,11 @@ Private $sSavePath As String
Private Const MIN_VERSION As String = "2.90.0"
Private Const MAX_VERSION As String = "3.0.90"
Private $sFormatSingle As String
Private $sFormatMin As String
Private $sFormatMax As String
Private $sFormatMinMax As String
Public Sub CheckProgram()
'IF $bChecked THEN RETURN
@ -214,21 +219,27 @@ Private Sub ComponentToPackageName(sComp As String) As String
End
Private Function GetDependencies() As String[]
Private Function GetDependencies() As String
Dim aDep As New String[]
Dim sRes As String
Dim sComp As String
Dim hLib As CLibraryInfo
Dim aVer As String[]
For Each sComp In Project.Components
If sComp = "gb.debug" Or If sComp = "gb.eval" Then Continue
aDep.Add(sComp)
sRes &= GetDependency(sComp)
Next
Return aDep
For Each sComp In Project.Libraries
sRes &= GetDependency(sComp)
Next
Return sRes
End
Private Function GetExtraDependencies(sSys As String, sFormatSingle As String, sFormatMin As String, sFormatMax As String, Optional sFormatMinMax As String) As String
Private Function GetExtraDependencies(sSys As String) As String
Dim iIndex As Integer
Dim sDep As String
@ -238,7 +249,7 @@ Private Function GetExtraDependencies(sSys As String, sFormatSingle As String, s
If Project.SameDependencies Then sSys = Project.Systems[0]
If Not sFormatMinMax Then sFormatMinMax = sFormatMin & sFormatMax
'If Not sFormatMinMax Then sFormatMinMax = sFormatMin & sFormatMax
For Each sDep In Split(Project.ExtraDependencies[sSys], ";")
@ -246,13 +257,13 @@ Private Function GetExtraDependencies(sSys As String, sFormatSingle As String, s
aDep.Resize(3)
If aDep[1] And If aDep[2] Then
sFormat = sFormatMinMax
sFormat = $sFormatMinMax
Else If aDep[1] Then
sFormat = sFormatMin
sFormat = $sFormatMin
Else If aDep[2] Then
sFormat = sFormatMax
sFormat = $sFormatMax
Else
sFormat = sFormatSingle
sFormat = $sFormatSingle
Endif
sRes &= Subst(sFormat, aDep[0], aDep[1], aDep[2])
@ -325,16 +336,25 @@ Private Function GetExtraFilesDir(sSys As String, sFormat As String) As String
End
Private Function GetComponentMinMaxVersion(sLib As String) As String[]
Private Function GetDependency(sLib As String) As String
Dim hComponent As CComponent
Dim hLibrary As CLibraryInfo
Dim sVersion As String
Dim aMinVersion As String[]
Dim aMaxVersion As String[]
Dim sPackageName As String
hComponent = CComponent.All[sLib]
sVersion = hComponent.Version
If Not sVersion Then sVersion = System.FullVersion
If Left(sLib) = "/" Then
hLibrary = New CLibraryInfo(sLib)
sPackageName = hLibrary.GetPackageName()
sVersion = hLibrary.Version
Else
hComponent = CComponent.All[sLib]
sPackageName = ComponentToPackageName(sLib)
sVersion = hComponent.Version
If Not sVersion Then sVersion = System.FullVersion
Endif
aMinVersion = Split(sVersion, ".")
If aMinVersion[1] = "0" Then
@ -350,7 +370,7 @@ End
aMaxVersion.Resize(3)
aMaxVersion[2] = "90"
Return [aMinVersion.Join("."), aMaxVersion.Join(".")]
Return Subst($sFormatMinMax, sPackageName, aMinVersion.Join("."), aMaxVersion.Join("."))
End
@ -443,6 +463,11 @@ Private Function MakeDebPackage(sSys As String)
Inc Application.Busy
$sFormatSingle = ", &1"
$sFormatMin = ", &1 (>= &2)"
$sFormatMax = ", &1 (<< &3)"
$sFormatMinMax = $sFormatMin & $sFormatMax
'$sName = Replace$($sName, "_", "-")
sIcon = $sPackageName & ".png"
@ -496,9 +521,9 @@ Private Function MakeDebPackage(sSys As String)
PrintOnlyShowIn(hFile, $sCategories)
Close #hFile
Endif
'Step 3. Create debianization needed files: control, rules
'debian/copyright
AddLog(("Sources are being debianizated."))
hFile = Open sPackagePath &/ "debian/copyright" For Create
Print #hFile, "This package was debianized by " & Project.Maintainer & " <" & Project.Address & "> on"
@ -523,21 +548,21 @@ Private Function MakeDebPackage(sSys As String)
'debian/menu
If Not Project.CreateComponent Then
hFile = Open sPackagePath &/ "debian/menu" For Create
Print #hFile, "?package("; $sPackageName; "):needs=\""; IIf(IsConsoleProject(), "text", "X11"); "\" section \""; Project.Menus[sSys]; "\"\\"
Print #hFile, "title=\""; IIf(Project.Title <> "", Project.Title, Project.Name); "\"\\"
Print #hFile, "command=\"/usr/bin/"; $sPackageName; ".gambas\"\\"
Print #hFile, "icon=\"/usr/share/pixmaps/"; sIcon; "\""
Close #hFile
hFile = Open sPackagePath &/ "debian/menu" For Create
Print #hFile, "?package("; $sPackageName; "):needs=\""; IIf(IsConsoleProject(), "text", "X11"); "\" section \""; Project.Menus[sSys]; "\"\\"
Print #hFile, "title=\""; IIf(Project.Title <> "", Project.Title, Project.Name); "\"\\"
Print #hFile, "command=\"/usr/bin/"; $sPackageName; ".gambas\"\\"
Print #hFile, "icon=\"/usr/share/pixmaps/"; sIcon; "\""
Close #hFile
Endif
'debian/dirs
hFile = Open sPackagePath &/ "debian/dirs" For Create
If Project.CreateComponent Then
Print #hFile, "usr/share/gambas"; System.Version; "/info\nusr/lib/gambas"; System.Version
If Exist(Project.Dir &/ ".hidden/control") Then Print #hFile, "usr/share/gambas"; System.Version; "/control/"; Shell$($sName)
Print #hFile, "usr/share/gambas"; System.Version; "/info\nusr/lib/gambas"; System.Version
If Exist(Project.Dir &/ ".hidden/control") Then Print #hFile, "usr/share/gambas"; System.Version; "/control/"; Shell$($sName)
Else
Print #hFile, "usr/bin\nusr/share/applications\nusr/share/pixmaps"
Print #hFile, "usr/bin\nusr/share/applications\nusr/share/pixmaps"
Endif
Print #hFile, GetExtraFilesDir(sSys, "\n&1")
Close #hFile
@ -545,12 +570,12 @@ Private Function MakeDebPackage(sSys As String)
'debian/install
hFile = Open sPackagePath &/ "debian/install" For Create
If Project.CreateComponent Then
Print #hFile, "src/"; $sName; "/"; $sName; ".gambas usr/lib/gambas" & System.Version
If Exist(Project.Dir &/ ".hidden/control") Then Print #hFile, "src/"; $sName; "/control/*.png usr/share/gambas" & System.Version &/ "control" &/ Shell$($sName)
Print #hFile, "src/"; $sName; "/"; $sName; ".gambas usr/lib/gambas" & System.Version
If Exist(Project.Dir &/ ".hidden/control") Then Print #hFile, "src/"; $sName; "/control/*.png usr/share/gambas" & System.Version &/ "control" &/ Shell$($sName)
Else
Print #hFile, "src/"; $sName; "/"; $sName; ".gambas usr/bin"
Print #hFile, "src/"; $sName; "/"; sIcon; " usr/share/pixmaps"
Print #hFile, "debian/"; $sPackageName; ".desktop usr/share/applications"
Print #hFile, "src/"; $sName; "/"; $sName; ".gambas usr/bin"
Print #hFile, "src/"; $sName; "/"; sIcon; " usr/share/pixmaps"
Print #hFile, "debian/"; $sPackageName; ".desktop usr/share/applications"
Endif
Print #hFile, GetExtraFiles(sSys, "\nsrc/" & $sName & ".hidden/&1 &2")
Close #hFile
@ -562,12 +587,13 @@ Private Function MakeDebPackage(sSys As String)
Print #hFile, "Priority: optional"
Print #hFile, "Maintainer: "; Project.Maintainer; " <"; Project.Address; ">"
Print #hFile, "Build-Depends: debhelper (>= 5.0.0), gambas2-dev (>= "; MIN_VERSION; "), gambas2-dev (<< "; MAX_VERSION; ")";
For Each sLib In GetDependencies()
aVer = GetComponentMinMaxVersion(sLib)
sLib = ComponentToPackageName(sLib)
Print #hFile, ", "; sLib; " (>= "; aVer[0]; "), "; sLib; " (<< "; aVer[1]; ")";
Next
Print #hFile, GetExtraDependencies(sSys, ", &1", ", &1 (>= &2)", ", &1 (<< &3)");
' For Each sLib In GetDependencies()
' aVer = GetComponentMinMaxVersion(sLib)
' sLib = ComponentToPackageName(sLib)
' Print #hFile, ", "; sLib; " (>= "; aVer[0]; "), "; sLib; " (<< "; aVer[1]; ")";
' Next
Print #hFile, GetDependencies();
Print #hFile, GetExtraDependencies(sSys);
Print #hFile
Print #hFile, "Standards-Version: 3.7.2"
@ -576,12 +602,13 @@ Private Function MakeDebPackage(sSys As String)
Print #hFile, "Architecture: all"
Print #hFile, "Depends: gambas"; System.Version; "-runtime (>= "; MIN_VERSION; "), gambas"; System.Version; "-runtime (<< "; MAX_VERSION; ")";
If Not Project.CreateComponent Then
For Each sLib In GetDependencies()
aVer = GetComponentMinMaxVersion(sLib)
sLib = ComponentToPackageName(sLib)
Print #hFile, ", "; sLib; " (>= "; aVer[0]; "), "; sLib; " (<< "; aVer[1]; ")";
Next
Print #hFile, GetExtraDependencies(sSys, ", &1", ", &1 (>= &2)", ", &1 (<< &3)");
' For Each sLib In GetDependencies()
' aVer = GetComponentMinMaxVersion(sLib)
' sLib = ComponentToPackageName(sLib)
' Print #hFile, ", "; sLib; " (>= "; aVer[0]; "), "; sLib; " (<< "; aVer[1]; ")";
' Next
Print #hFile, GetDependencies();
Print #hFile, GetExtraDependencies(sSys);
Endif
Print #hFile
aLine = Split($sDescription, "\n")
@ -717,6 +744,11 @@ Private Function MakeRpmPackage(sSys As String)
Inc Application.Busy
$sFormatSingle = ",&1"
$sFormatMin = ",&1 >= &2"
$sFormatMax = ",&1 < &3"
$sFormatMinMax = $sFormatMin & $sFormatMax
Select Case sSys
Case "mandriva"
@ -730,8 +762,8 @@ Private Function MakeRpmPackage(sSys As String)
sVersionSuffix = ""
Case "suse"
sDistribution = "SuSE Linux"
sVendor = "SuSE Linux AG"
sDistribution = "OpenSUSE"
sVendor = "Novell"
sVersionSuffix = "suse"
End Select
@ -808,14 +840,15 @@ Private Function MakeRpmPackage(sSys As String)
If Not Project.CreateComponent Then
For Each sLib In GetDependencies()
aVer = GetComponentMinMaxVersion(sLib)
sLib = ComponentToPackageName(sLib)
Print #hFile, ","; sLib; " >= "; aVer[0];
Print #hFile, ","; sLib; " < "; aVer[1];
Next
' For Each sLib In GetDependencies()
' aVer = GetComponentMinMaxVersion(sLib)
' sLib = ComponentToPackageName(sLib)
' Print #hFile, ","; sLib; " >= "; aVer[0];
' Print #hFile, ","; sLib; " < "; aVer[1];
' Next
Print #hFile, GetExtraDependencies(sSys, ",&1", ",&1 >= &2", ",&1 < &3");
Print #hFile, GetDependencies();
Print #hFile, GetExtraDependencies(sSys);
Endif
@ -1150,6 +1183,11 @@ Private Sub MakeTgzPackage(sSys As String)
Inc Application.Busy
$sFormatSingle = "&1\n"
$sFormatMin = "&1 >= &2\n"
$sFormatMax = "&1 < &3\n"
$sFormatMinMax = $sFormatMin & $sFormatMax
sDistribution = "Slackware"
sVendor = "Slackware"
@ -1267,14 +1305,15 @@ Private Sub MakeTgzPackage(sSys As String)
If Not Project.CreateComponent Then
For Each sLib In GetDependencies()
aVer = GetComponentMinMaxVersion(sLib)
sLib = ComponentToPackageName(sLib)
Print #hFile, sLib; " >= "; aVer[0]
Print #hFile, sLib; " < "; aVer[1]
Next
' For Each sLib In GetDependencies()
' aVer = GetComponentMinMaxVersion(sLib)
' sLib = ComponentToPackageName(sLib)
' Print #hFile, sLib; " >= "; aVer[0]
' Print #hFile, sLib; " < "; aVer[1]
' Next
Print #hFile, GetExtraDependencies(sSys, "&1\n", "&1 >= &2\n", "&1 < &3\n");
Print #hFile, GetDependencies();
Print #hFile, GetExtraDependencies(sSys);
Endif

View File

@ -44,6 +44,7 @@ Public ExtraAutoconfTest As String
Public Categories As Collection
Public Prefix As Boolean
Public UseRelease As Boolean
Public PackageName As String
Public Maintainer As String
Public Address As String
Public Vendor As String
@ -2549,6 +2550,7 @@ Public Sub ReadProject(Optional bConvert As Boolean)
ExtraAutoconfTest = ""
Prefix = False
UseRelease = False
PackageName = ""
ExecPath = Project.Dir &/ Project.Name & ".gambas"
SourcePath = ""
CreateComponent = False
@ -2718,6 +2720,9 @@ Public Sub ReadProject(Optional bConvert As Boolean)
Case "userelease"
UseRelease = Val(sVal)
Case "packagename"
PackageName = sVal
Case "maintainer"
Maintainer = sVal
@ -2860,6 +2865,7 @@ Public Sub WriteProject(Optional bComponentDoNotChange As Boolean, Optional bMak
If License Then Print #hFic, "License="; License
If Prefix Then Print #hFic, "Prefix=1"
If UseRelease Then Print #hFic, "UseRelease=1"
If PackageName Then Print #hFic, "PackageName="; PackageName
If CreateEachDirectory Then Print #hFic, "CreateEachDirectory=1"
If Systems.Count Then

View File

@ -37,3 +37,22 @@ Public Sub GetInfo()
Exec [System.Path &/ "bin/gba" & System.Version, "-x", Path, ".info"] To Info
End
Public Sub GetPackageName() As String
Dim sProject As String
Dim sLine As String
Dim aLine As String[]
Dim aVersion As String[]
Exec [System.Path &/ "bin/gba" & System.Version, "-x", Path, ".project"] To sProject
For Each sLine In Split(sProject, "\n")
aLine = Scan(sLine, "PackageName=*")
If aLine.Count Then Return aLine[0]
Next
aVersion = Split(Version, ".")
Return String.UCase(Name & "-" & aVersion[0] & "." & aVersion[1])
End

View File

@ -21,7 +21,7 @@ Public Sub _new()
$hDrawingArea = New DrawingArea(Me) As "DrawingArea"
'$hDrawingArea.Mouse = Mouse.Pointing
Me.H = Max(ICON_SIZE, Desktop.Scale * 7) + PADDING * 2
Me.H = Max(ICON_SIZE, Desktop.Scale * 9) + PADDING * 2
End
@ -51,9 +51,12 @@ Public Sub DrawingArea_Draw()
With $hLibraryInfo
$sText = "<b>" & .Name & "</b> " & .Version
$sText &= Subst("<br><font size=\"-1\" color=\"&1\"><b>", If(IsSelected(), "white", "gray")) & Replace($sPath, System.User.Home, "~") & "</b></font>"
$sText = Subst("<font color=\"&1\">", If(IsSelected(), "white", "black"))
$sText &= "<font size=\"+1\"><b>" & .Name & "</b> " & .Version & "</font>"
'$sText &= Subst("<font size=\"-1\" color=\"&1\"><b>", If(IsSelected(), "white", "gray")) & Replace($sPath, System.User.Home, "~") & "</b></font>"
$sText &= "<hr><font size=\"-1\"><b>" & ("Location") & "&nbsp;:&nbsp;</b>" & Replace($sPath, System.User.Home, "~") & "</font>"
$sText &= "<br><font size=\"-1\"><b>" & ("Provides") & "&nbsp;:&nbsp;</b>" & .Classes.Join(", ") & "</font>"
$sText &= "</font>"
$iTextW = Draw.RichTextWidth($sText)

View File

@ -23,7 +23,7 @@ AC_DEFUN([GB_INIT_PROJECT],
AM_INIT_AUTOMAKE($1, $(PACKAGE_VERSION))
## List of needed components
COMPONENTS=`cat $1/.project | grep "Library=" | sed s/"Library="//g`
COMPONENTS=`cat $1/.project | grep "Component=" | sed s/"Component="//g`
## Check if the project is a component
COMPONENT_build=`cat $1/.project | grep "MakeComponent=" | sed s/"MakeComponent="//g`

View File

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2606)
# Compiled with Gambas 2.99.0 (r3015)
Title=Gambas DBus Explorer
Startup=FVersiongbXML
Icon=dbus64.png

View File

@ -101,11 +101,9 @@ SearchString=True
[OpenFile]
File[1]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/.src/FVersiongbXML.form"
File[2]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/.src/FVersiongbXML.class:93.50"
File[3]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/Text1:0.0"
Active=4
File[4]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/Text2:0.0"
Count=4
Active=2
File[2]="/home/benoit/gambas/3.0/link/share/gambas3/examples/Automation/DBusExplorer/.src/FVersiongbXML.class:99.19"
Count=2
[Watches]
Count=0

View File

@ -1,88 +0,0 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.freedesktop.DBus.Introspectable">
<method name="Introspect">
<arg name="data" direction="out" type="s"/>
</method>
</interface>
<interface name="org.freedesktop.DBus">
<method name="Hello">
<arg direction="out" type="s"/>
</method>
<method name="RequestName">
<arg direction="in" type="s"/>
<arg direction="in" type="u"/>
<arg direction="out" type="u"/>
</method>
<method name="ReleaseName">
<arg direction="in" type="s"/>
<arg direction="out" type="u"/>
</method>
<method name="StartServiceByName">
<arg direction="in" type="s"/>
<arg direction="in" type="u"/>
<arg direction="out" type="u"/>
</method>
<method name="UpdateActivationEnvironment">
<arg direction="in" type="a{ss}"/>
</method>
<method name="NameHasOwner">
<arg direction="in" type="s"/>
<arg direction="out" type="b"/>
</method>
<method name="ListNames">
<arg direction="out" type="as"/>
</method>
<method name="ListActivatableNames">
<arg direction="out" type="as"/>
</method>
<method name="AddMatch">
<arg direction="in" type="s"/>
</method>
<method name="RemoveMatch">
<arg direction="in" type="s"/>
</method>
<method name="GetNameOwner">
<arg direction="in" type="s"/>
<arg direction="out" type="s"/>
</method>
<method name="ListQueuedOwners">
<arg direction="in" type="s"/>
<arg direction="out" type="as"/>
</method>
<method name="GetConnectionUnixUser">
<arg direction="in" type="s"/>
<arg direction="out" type="u"/>
</method>
<method name="GetConnectionUnixProcessID">
<arg direction="in" type="s"/>
<arg direction="out" type="u"/>
</method>
<method name="GetAdtAuditSessionData">
<arg direction="in" type="s"/>
<arg direction="out" type="ay"/>
</method>
<method name="GetConnectionSELinuxSecurityContext">
<arg direction="in" type="s"/>
<arg direction="out" type="ay"/>
</method>
<method name="ReloadConfig">
</method>
<method name="GetId">
<arg direction="out" type="s"/>
</method>
<signal name="NameOwnerChanged">
<arg type="s"/>
<arg type="s"/>
<arg type="s"/>
</signal>
<signal name="NameLost">
<arg type="s"/>
</signal>
<signal name="NameAcquired">
<arg type="s"/>
</signal>
</interface>
</node>

View File

@ -1,51 +0,0 @@
Connected to D-Bus.
Received reply from :1.2
Arguments: "<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> <node> <interface name="org.kde.network"> <method name="deviceData"> <arg type="(ssi)" direction="out"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetDevice"/> <arg name="hostName" type="s" direction="in"/> </method> <method name="serviceData"> <arg type="(ssss)" direction="out"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetService"/> <arg name="hostName" type="s" direction="in"/> <arg name="serviceName" type="s" direction="in"/> <arg name="serviceType" type="s" direction="in"/> </method> <method name="deviceDataList"> <arg type="a(ssi)" direction="out"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetDeviceList"/> </method> <method name="serviceDataList"> <arg type="a(ssss)" direction="out"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetServiceList"/> <arg name="hostName" type="s" direction="in"/> </method> </interface> <interface name="org.freedesktop.DBus.Properties"> <method name="Get"> <arg name="interface_name" type="s" direction="in"/> <arg name="property_name" type="s" direction="in"/> <arg name="value" type="v" direction="out"/> </method> <method name="Set"> <arg name="interface_name" type="s" direction="in"/> <arg name="property_name" type="s" direction="in"/> <arg name="value" type="v" direction="in"/> </method> <method name="GetAll"> <arg name="interface_name" type="s" direction="in"/> <arg name="values" type="a{sv}" direction="out"/> <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/> </method> </interface> <interface name="org.freedesktop.DBus.Introspectable"> <method name="Introspect"> <arg name="xml_data" type="s" direction="out"/> </method> </interface> <node name="KDebug"/> <node name="MainApplication"/> <node name="NotificationItemWatcher"/> <node name="kbuildsycoca"/> <node name="kded"/> <node name="modules"/> <node name="org"/> </node> "
Connected to D-Bus.
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.kde.network">
<method name="deviceData">
<arg type="(ssi)" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetDevice"/>
<arg name="hostName" type="s" direction="in"/>
</method> <method name="serviceData">
<arg type="(ssss)" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetService"/>
<arg name="hostName" type="s" direction="in"/>
<arg name="serviceName" type="s" direction="in"/>
<arg name="serviceType" type="s" direction="in"/>
</method>
<method name="deviceDataList">
<arg type="a(ssi)" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetDeviceList"/>
</method> <method name="serviceDataList">
<arg type="a(ssss)" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mollet::NetServiceList"/>
<arg name="hostName" type="s" direction="in"/> </method>
</interface>
<interface name="org.freedesktop.DBus.Properties">
<method name="Get">
<arg name="interface_name" type="s" direction="in"/>
<arg name="property_name" type="s" direction="in"/>
<arg name="value" type="v" direction="out"/>
</method> <method name="Set">
<arg name="interface_name" type="s" direction="in"/>
<arg name="property_name" type="s" direction="in"/>
<arg name="value" type="v" direction="in"/>
</method> <method name="GetAll">
<arg name="interface_name" type="s" direction="in"/>
<arg name="values" type="a{sv}" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
</method> </interface>
<interface name="org.freedesktop.DBus.Introspectable">
<method name="Introspect">
<arg name="xml_data" type="s" direction="out"/> </method> </interface>
<node name="KDebug"/> <node name="MainApplication"/>
<node name="NotificationItemWatcher"/>
<node name="kbuildsycoca"/>
<node name="kded"/>
<node name="modules"/>
<node name="org"/> </node> "

View File

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2606)
# Compiled with Gambas 2.99.0 (r3015)
Startup=FBrowser
Icon=konqueror.png
Version=0.0.13

View File

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2606)
# Compiled with Gambas 2.99.0 (r3015)
Title=Demo printing application
Startup=FormPrinting
Icon=Images/document-print.png

View File

@ -216,7 +216,7 @@ static int path_count(void)
int main(int argc, char **argv)
{
DIR *dir;
char *path;
const char *path;
struct dirent *dirent;
char *file_name;
const char *file;
@ -253,8 +253,13 @@ int main(int argc, char **argv)
len_prefix = strlen(file);
path_init(file);
/* .project file always first ! */
ARCH_add_file(ARCH_project);
/* .startup and .project file always first ! */
path = FILE_cat(FILE_get_dir(ARCH_project), ".startup", NULL);
if (FILE_exist(path)) ARCH_add_file(path);
path = FILE_cat(FILE_get_dir(ARCH_project), ".project", NULL);
if (FILE_exist(path)) ARCH_add_file(path);
for(;;)
{
@ -355,7 +360,7 @@ int main(int argc, char **argv)
_NEXT_PATH:
if (dir != NULL) closedir(dir);
FREE(&path, "main");
FREE((char **)&path, "main");
}
path_exit();

View File

@ -90,10 +90,10 @@ static void load_arch(ARCH *arch, const char *path)
_swap = arch->header.magic != ARCH_MAGIC;
if (_swap)
{
fprintf(stderr, "gbx: Swapping archive\n");
SWAP_ints((int *)&arch->header, 6);
}
if (arch->header.magic != ARCH_MAGIC)
arch_error("not an archive");
//if (arch->header.version != ARCH_VERSION)
// arch_error("bad version");