Bug #579

use default behaviour for make targets

Added by planetmaker over 10 years ago. Updated about 10 years ago.

Status:ClosedStart date:2009-09-23
Priority:NormalDue date:
Assignee:planetmaker% Done:

100%

Category:build system
Target version:0.2.1

Description

make: build the thing
make install: install (via sudo) globally, unless configured via makefile.local differently. Problem: detect whether it's a nightly or release for both, hg and tarball (or at least for both cases by some means - maybe always as release for tarballs?)

unify_make.diff Magnifier (4 KB) planetmaker, 2009-12-10 11:35

Associated revisions

Revision 269:1201fd778830
Added by planetmaker about 10 years ago

Change: Determine automatically whether we build a release or a nightly and chose the proper file and dir names. This makes the release targets obsolet (part of issue #579)

Revision 269:1201fd778830
Added by planetmaker about 10 years ago

Change: Determine automatically whether we build a release or a nightly and chose the proper file and dir names. This makes the release targets obsolet (part of issue #579)

Revision 276:ad5bd3b3bf70
Added by planetmaker about 10 years ago

Fix (r269): Re-add version information to the bundle files except tar. (Closes #579)

Revision 276:ad5bd3b3bf70
Added by planetmaker about 10 years ago

Fix (r269): Re-add version information to the bundle files except tar. (Closes #579)

History

#1 Updated by Ammler about 10 years ago

the other issue is, that it needs the install directory of openttd data, that might differ from distro:
/usr/share/openttd/data (suse) or /usr/share/games/openttd/data (whatever) or in a local install: /usr/local/share/openttd/data

so I guess the need of --INSTALLDIR="" might still be useful

#2 Updated by planetmaker about 10 years ago

Wouldn't is suffice to accept a command line or Makefile.local INSTALLDIR, if it's given? I have never tested whether the command line would overrule a Makefile.local one or the automatic rules, but if not that could be arranged.

#3 Updated by Ammler about 10 years ago

As you see in the current spec

http://dev.openttdcoop.org/projects/opengfx/repository/entry/extra/os/rpm/opengfx.spec#L40

it works like now just fine, I would just replace the target name install-release with install and make a target install-dev or install-testing or whatever for current install

#4 Updated by planetmaker about 10 years ago

  • File unify_make.diff added
  • % Done changed from 0 to 20

Please test the attached diff for the makefiles (best probably done in a cloned test repo). Does make install behave as it is supposed to do now for both, nightly and releases? I removed all release targets (except release-source) and just use install-dir for all.

#5 Updated by planetmaker about 10 years ago

  • File deleted (unify_make.diff)

#6 Updated by planetmaker about 10 years ago

Updated diff

#7 Updated by planetmaker about 10 years ago

  • Status changed from New to Closed
  • % Done changed from 20 to 100

In r269

#8 Updated by Ammler about 10 years ago

  • Status changed from Closed to Reopened
  • Target version changed from 0.2.0 to 0.2.1

The new patch somehow now misses the revision for non release (no tag) bundles.

opengfx-nightly.zip -> opengfx-nightly-r275.zip

#9 Updated by planetmaker about 10 years ago

  • Status changed from Reopened to Closed

Applied in changeset r276.

Also available in: Atom PDF