Commit 439666ea authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

Split class into generic and java pieces 

If you only want generic, include dev_env::generic. If you want
java include dev_env::java (which will include dev_env::generic).
parent 57effefe

NEWS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
release/000.004 (2013-11-22)



    Split base class into dev_env::generic and dev_env::java. Note that

    the dev_env::java class includes dev_env::generic.

manifests/generic.pp

+59 −59
Original line number Diff line number Diff line
@@ -8,10 +8,11 @@ class dev_env::generic { 
  }



  # Operating system dependent configurations

    case $operatingsystem {

  case $::operatingsystem {

    'debian', 'ubuntu': {

            case $lsbdistcodename {

      case $::lsbdistcodename {

        'squeeze': { package {'git':      ensure => present } }

        default:   { pacakge {'git-core': ensure => installed }}

      }

      package {

        'build-essential'  : ensure => installed;
@@ -26,7 +27,6 @@ class dev_env::generic { 
        'dpatch'           : ensure => installed;

        'fakeroot'         : ensure => installed;

        'git-buildpackage' : ensure => installed;

                'git-core'         : ensure => installed;

        'gitk'             : ensure => installed;

        'gnupg'            : ensure => installed;

        'lintian'          : ensure => installed;
@@ -54,7 +54,7 @@ class dev_env::generic { 
        'unixODBC-devel'   : ensure => installed;  # openldap

      }

      # gnupg version change for rhel6 makes this more complex

            case $lsbmajdistrelease {

      case $::lsbmajdistrelease {

        '6': {

          package { 'gnupg2': ensure => installed; }

        }

manifests/java.pp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
# Install java for development purposes



class dev_env::java {



  include dev_env::generic ;



  case $::lsbdistcodename {

    'precise':  { include java::v6 }

    'oneiric':  { include java::v6 }

    'natty':    { include java::v6 }

    'karmic':   { include java::v6 }

    'lucid':    { include java::v6 }

    'tikanga':  { include java::v6 }

    'santiago': { include java::v6 }

    'squeeze':  { include java::v6 }

    'wheezy':   { include packages::java-7 }

    default:    { include java::v5 }

  }



}
 
 No newline at end of file