cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
144,828 Commits 1 Branch 0 Tags
Commit Graph

5452 Commits

Author SHA1 Message Date
espie
703ae9ad93 restore logic to NOT register debug packages 
noticed by aja@, thx
 2019-11-24 12:23:22 +00:00
espie
eeedab813e use the exact same logic for FETCH_PACKAGES: grab all files. If we got 
them all we move them (and we can still fail if permissions are not okay)
Otherwise, we run the normal _internal-package-only again, with FETCH_PACKAGES
neutralized (as before)

This fixes the issue reported by semarie@ and kmos@
 2019-11-23 16:31:20 +00:00
espie
085528005c tweak the logic slightly: use one single variable _pkg${_S} to hold the 
packages we build (normal/debug) and put the code back inside the actual
target instead of fragments.

Stop doing tests (shell exits as usual and trap is enough to remove temp
files).

The same logic will be used for debug_packages
 2019-11-23 16:19:48 +00:00
espie
bdfceef887 add extra variables to make the definition of PACKAGE_COOKIE more regular 
to be used for DEBUG_PACKAGES
 2019-11-23 16:00:34 +00:00
espie
5bc08af6fd zap useless tests (dates back when this governed _PACKAGE_LINKS as well, 
before the MULTI_PACKAGES/BUILD_PACKAGES separation)
 2019-11-23 15:50:14 +00:00
espie
58cccbe929 fix bug in FETCH_PACKAGES logic: do NOT run _internal-package-only if 
FETCH_PACKAGES succeeded. Also: error out if we can't copy/link the
cached package, as this is probably some permission error.
 2019-11-23 15:43:20 +00:00
sthen
593e1a38f9 portgen sqlports improvements, changes suggested by espie in response to my 
not-so-good change to just using the PortsQ "cache":

- use _paths/_ports directly rather than the "ports" view and remove bogus
flavour-clearing regex subst

- open sqlports ReadOnly
 2019-11-23 14:59:39 +00:00
abieber
e0f2a305ba Remove unused NPM bits. 
OK afresh1@
 2019-11-22 00:01:10 +00:00
sthen
273bc91140 - comment-out net/cvsync uid 
- drop description of "noauto", not used since 2006
 2019-11-20 15:37:52 +00:00
afresh1
45800df741 Remove sqlports-compact support from portgen 
Ok, initial idea, and initial patch from cwen@
 2019-11-19 22:43:31 +00:00
espie
31c7e58902 do the destdir dance using File::Spec for simpler, canonical paths 2019-11-19 16:35:20 +00:00
espie
0b8672b605 rename generic "out" into "mk" since we're writing to a makefile 
(makes it more obvious compared to the plist fh)

start preparing for actually handling links
 2019-11-19 15:49:30 +00:00
espie
cf1e5fa4f3 repair 2019-11-19 15:06:19 +00:00
espie
d189070fb1 document a design choice 2019-11-19 14:55:42 +00:00
espie
2a18d1de91 ... and the argument parsing proper is now identical as well! 2019-11-19 14:54:01 +00:00
espie
a5d9dff07c inherit from PlistReader so that differences are located in a better location 2019-11-19 14:51:32 +00:00
espie
f1c3d659c4 move the common state things as well 2019-11-19 14:45:28 +00:00
espie
978d83893b make the state code identical in preparation for lifting. 2019-11-19 14:41:29 +00:00
espie
cea793235b start moving common code into its own file 2019-11-19 14:38:56 +00:00
espie
289bc15185 add DEBUG_* glue 
okay sthen@
 2019-11-19 12:39:04 +00:00
espie
5c2dd6bbc8 move process_subpackage logic into the PlistReader class in order to 
share the code
 2019-11-18 16:07:17 +00:00
espie
37b5d2c0a2 make things closer to update-plist 2019-11-18 15:56:29 +00:00
espie
9ffc3dddaf tweak code order slightly to make things identical to build-debug-info 2019-11-18 15:54:48 +00:00
espie
28daf77466 I'm an idiot, of course conflict requires some tweaks as well 2019-11-14 12:47:03 +00:00
espie
aaff77ddbc temporary fix: if we don't know how to generate debug for symlinks, don't 
bother registering them
 2019-11-14 08:48:44 +00:00
espie
6fdf092c90 clean-up (put stuff into self, not state) 
inherit from BaseFS, so that dest/undest/resolve_link can happen
 2019-11-13 16:16:51 +00:00
espie
ac67505216 tweak call, some options are not needed, passing PORTSDIR will be 
necessary to grab other code.
also error out when file writing breaks.
 2019-11-13 15:22:41 +00:00
espie
029ecfd382 move the dest/undest/resolve_link code to its own class, so it can be 
reused in other WRKINST contexts (build-debug-info)

Also make use of state to display errors, like duh
 2019-11-13 11:38:48 +00:00
espie
ed96787dac tweak it yet again to always run build-debug-info, it's cheap enough 2019-11-13 10:08:57 +00:00
rsadowski
e2593bc802 update MASTER_SITE_KDE and prefer https over http/ftp. 2019-11-12 21:24:14 +00:00
espie
dbc7492568 don't error out on symlinks for now, this allows things to proceed 2019-11-12 20:06:54 +00:00
espie
10152e79fb copy remaining annotations with special semantics (cwd but first, pkgpath 
with debug/ prepended)

put a bit more boilerplate in the generated Makefile, so that the targets
themselves are much shorter
 2019-11-12 16:41:36 +00:00
espie
e9cee4d943 minor tweaks: 
- remove PKG_ARCH=* packages from DEBUG_PACKAGES, to help with
introspection
- ditch DEBUG_FILES entirely, the automated mechanism appears to be
good enough
- tweak show-debug-info to show the file names
 2019-11-12 16:40:26 +00:00
bentley
6e78e88d53 Update error message: pkg/README is PKGSTEM, not FULLPKGNAME. 2019-11-12 06:01:04 +00:00
espie
0b1efbd66c the warning about changed debug info is no longer relevant 
keep the notice_new_file hook though, it might come in handy
 2019-11-11 19:00:27 +00:00
espie
5c56964120 permissions 2019-11-11 18:59:36 +00:00
espie
9e82963b04 missing files can now be hard error since update-plist is no longer dependent 
on us
 2019-11-11 18:54:24 +00:00
espie
d140f7d998 let's run build-debug-info as a separate step after make fake, so that 
update-plist doesn't interfere.

zap that cookie after update-plist so that changes get propagated nicely
without needing to rerun make fake
 2019-11-11 18:52:59 +00:00
espie
e1c4bb8586 fix thinko. of course the stupid dependencies get changed last, so touch 
the target
 2019-11-11 18:33:05 +00:00
espie
7cb6e3a71a write the "generate debug info" as a Makefile so it can be run again 
and again in the auto-generated case.
 2019-11-11 18:22:27 +00:00
espie
d1f1c96c65 tweak the heuristics for DEBUG_PACKAGES: exclude arch-independent packages, 
so that you can set DEBUG_PACKAGES=${BUILD_PACKAGES} most of the time
 2019-11-11 17:40:06 +00:00
espie
7109855c36 don't register automatically generated debug*plists, allows for quick 
change in the infrastructure, and follows what we actually do for non
static plists
 2019-11-11 17:30:13 +00:00
espie
01155b231a build-debug-info actually needs to operate under ${WRKINST}${TRUEPREFIX} 
so that it can figure out hardlink

create special LINK entries that just make hardlinks on the dbg info
for already generated stuff.

This solves the python problem noticed by aja@
 2019-11-10 20:44:51 +00:00
espie
ec94319f61 note to self (noticed by aja@ in python) 2019-11-10 18:27:51 +00:00
espie
8f163ed309 warn when update-plist changed files with debug info, so that ppl know 
they need to re-do fake to get proper debug packages
 2019-11-10 18:26:39 +00:00
espie
68ffed6fe9 DON'T do PKGPATHS yet... sqlports does not like 2019-11-10 17:41:47 +00:00
espie
6b45c88ee8 if the plist changes, some files may vanish... fake should STILL finish, 
so just WARN for non existing files with debug stuff
 2019-11-10 17:36:20 +00:00
espie
0948639c33 second iteration of DEBUG_PACKAGES, now with some automation, with feedback 
from landry/aja/pirofti/others
 2019-11-10 16:48:19 +00:00
espie
b76784517b let update-plist deal with debug stuff 
- ignore debug files in the fake directory
- recognize and annotate shared objects and static libraries correctly

*THIS REQUIRES CURRENT PKG_* CODE TO WORK!*
if your package contains static libraries/shared objects, update-plist
WILL error out saying it can't create the new classes
 2019-11-10 16:46:44 +00:00
espie
6e3cab099d new helper, creates debug-PLISTs for debug packages. 
Exact same pattern as update-plist, in order to read all pkg_create
arguments in one go
 2019-11-10 16:44:55 +00:00