Cross package maker. DEB/RPM generation or conversion. Derived from jordansissel/fpm.

⌈⌋ ⎇ branch:  cross package maker


Check-in [863ccf8053]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Add convenience PKG_FLAG variation (uppercase pkg type) for preprocessor usage.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 863ccf80531b86fbbe8ae0896268e8da61f794b3
User & Date: mario 2015-04-15 18:32:36
Context
2015-04-17
22:14
Add --zip-shebang option, useful for making Python zip apps (pyz). check-in: 11e5c12d1d user: mario tags: trunk
2015-04-15
18:32
Add convenience PKG_FLAG variation (uppercase pkg type) for preprocessor usage. check-in: 863ccf8053 user: mario tags: trunk
15:54
Workaround for ENV variables never showing up in make Packfile. And only take first entry from :output_type (if it's an -t deb,rpm,zip list). check-in: 732b03f50f user: mario tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to lib/fpm/package/filter_packfile.rb.

︙︙
51
52
53
54
55
56
57

58
59
60
61
62
63
64

    # Prepare PACK_TYPE env vars
    otype = @attributes[:output_type]
    if otype.kind_of?(Array)
      otype = otype[0]
    end
    env = {
      "PACK_TYPE" => otype,

      "PACK_NAME" => @name,
      "PACK_VERSION" => @version,
      "PACK_ARCH" => @architecture,
      "PACK_STAGING" => @staging_path,
      "PACK_BUILD" => @build_path,
      "PACK_DIRECTORIES" => @directories.join(" ")
    }








>








51
52
53
54
55
56
57
58
59
60
61
62
63
64
65

    # Prepare PACK_TYPE env vars
    otype = @attributes[:output_type]
    if otype.kind_of?(Array)
      otype = otype[0]
    end
    env = {
      "PACK_TYPE" => otype,
      "PKG_FLAG" => "PKG_" + otype.upcase,  # for use as preprocessor flag -D PKG_DEB
      "PACK_NAME" => @name,
      "PACK_VERSION" => @version,
      "PACK_ARCH" => @architecture,
      "PACK_STAGING" => @staging_path,
      "PACK_BUILD" => @build_path,
      "PACK_DIRECTORIES" => @directories.join(" ")
    }
︙︙