WebSVN – DevTools – Diff – /buildtool/trunk/src/generated/com/erggroup/buildtool/ripple/Package.java

   /**instance identifier
    * @attribute
    */
   String mVersion = new String();
+  /** Version string as specified by the user. Used with a ripple
+   *  type of 'F'
+   */
+  String mFixedVersion = new String();
   /**unique identifier
    * for daemon builds = mName + mExtension
    * for escrow builds = mName + mVersion + mExtension
    * @attribute
    */
   boolean mHasCircularDependency = false;
   /**constructor
    */
   Package(int pv_id, String pkg_name, String v_ext, String alias,
-          String pkg_vcs_tag, char change_type, char ripple_field)
+          String pkg_vcs_tag, char change_type, char ripple_field, String pkg_version)
+  {
     mLogger.debug("Package 1: pv_id " + pv_id + " pkg_name " + pkg_name + " v_ext " + v_ext + " alias " + alias + " pkg_vcs_tag " + pkg_vcs_tag + " change_type " + change_type);
     mId = pv_id;
     mName = pkg_name;
-    mVersion = "0.0.0000";
     mExtension = v_ext;
     mAlias = alias;
     mVcsTag = pkg_vcs_tag;
+    // Must not have any extension
+    mFixedVersion = pkg_version;
+    mFixedVersion = mFixedVersion.substring(0, mFixedVersion.length() - mExtension.length());
     if (change_type == 'M')
+    {
       // a ripple_field of 'L' indicates this package has limited version numbering
       mChangeType.setMajor(ripple_field == 'L' ? true : false);
+    }
     else if (change_type == 'N')
+    {
       mChangeType.setMinor(ripple_field == 'L' ? true : false);
+    }
-    else
+    else if (change_type == 'P')
+    {
       mChangeType.setPatch(ripple_field == 'L' ? true : false);
+    }
+    else if (change_type == 'F')
+    {
+      mChangeType.setFixed();
+    }
+    else
+    {
+        mChangeType.setUnknown();
+    }
+  }
   /**constructor
    */
   Package(int pv_id, String pkg_name, String pkg_version, String v_ext,
   /**applies the required version number change
    * returns 0 on success
    *         1 on cannot work with non standard versioning
    *         2 on ripple field limitations prevent a ripple build
+   *         3 on Invalid Change Type
    */
   int applyPV(ReleaseManager releaseManager, int rtag_id) throws Exception
+  {
     mLogger.debug("applyPV on Package " + mName);
+    //
-    // four scenarios, only applyPV for 3 of them
+    // Four scenarios, only applyPV for 3 of them
-    // WIP/test build exists:           mDirectlyPlanned == true;   mIndirectlyPlanned == true; mArchivalExistence don't care; mForcedRipple don't care - applyPV
+    //                                  mDirectlyPlanned    mIndirectlyPlanned  mArchivalExistence  mForcedRipple   Action
+    // WIP/test build exists:           true                true                don't care          don't care     applyPV
-    // Package version is out of date:  mDirectlyPlanned == false;  mIndirectlyPlanned == true; mArchivalExistence == true;    mForcedRipple don't care - applyPV
+    // Package version is out of date:  false               true                true                don't care     applyPV
-    // Forced ripple:                   mDirectlyPlanned == false;  mIndirectlyPlanned == true; mArchivalExistence don't care; mForcedRipple > 0        - applyPV
+    // Forced ripple:                   false               true                don't care          > 0            applyPV
-    // Package version does not exist:  mDirectlyPlanned == false;  mIndirectlyPlanned == true; mArchivalExistence == false;   mForcedRipple = 0    - do not applyPV
+    // Package version does not exist:  false               true                false               = 0            do not applyPV
+    //
     if ( !mDirectlyPlanned && mIndirectlyPlanned && !mArchivalExistence && mForcedRippleInstruction == 0 )
+    {
       // the package has an mIndirectlyPlanned flag set true in daemon mode because the package does not exist in an archive
       // do not apply a different package version
       mLogger.info("applyPV !mDirectlyPlanned && mIndirectlyPlanned && !mArchivalExistence && zero mForcedRippleInstruction on Package " + mName);
     // override - no longer doing a rebuild - version number change from this point on
     if ( mTestBuildInstruction == 0 )
+    {
       mRequiresSourceControlInteraction = true;
+    }
+    //
+    //  Detect invalid change type
+    //  Flagged when package instance is created
+    //
+    if (mChangeType.mUnknown)
+    {
+        mLogger.info("Package Vesrion specified on Package " + mName + "New Version:" + mVersion);
+        mLogger.info("applyPv returned 3");
+        return 3;
+    }
+    // If we are not calculating the new package version because the user has fixed the version
+    // of the package. We are given the new package version.
+    if (mChangeType.mFixed)
+    {
+        // mVersion is already setup
+        mVersion = mFixedVersion;
+        mLogger.info("Package Vesrion specified on Package " + mName + "New Version:" + mVersion);
+        releaseManager.claimVersion(mPid, mVersion + mExtension, rtag_id);
+        mLogger.info("applyPv returned 0");
+        return 0;
+    }
+    // We need to calculate the new version number
+    //
     MutableInt major = new MutableInt();
     major.value = 0;
     MutableInt minor = new MutableInt();
     minor.value = 0;
     MutableInt patch = new MutableInt();
     else
+    {
       //
       //    Can ripple a .cots package under very controlled conditions
       //    Its ends with a .patchBuild field
-      //    Package is marked as riple via build number
+      //    Package is marked as ripple via build number
-      //    Chaneg type og Major and Minor are not allowed
+      //    Change type of Major and Minor are not allowed
       //
       if ( !mChangeType.mMajor &&
            !mChangeType.mMinor &&
            mRippleField.mBuild &&
            mExtension.compareTo(".cots") == 0 &&
      * when true indicates the major, minor, patch and build number will be incremented according to field limits
      * @attribute
      */
     private boolean mLimit = false;
+    /**in terms of the mChangeType Package field,
+     * when true indicates the package version number will not be rippled. The user will have
+     * fixed the version number. This is only application to WIP packages
+     *
+     * @attribute
+     */
+    private boolean mFixed = false;
+    /**in terms of the mChangeType Package field,
+     * when true indicates the method of rippling a package version
+     * number is not known.
+     *
+     * @attribute
+     */
+    private boolean mUnknown = false;
     /**constructor
      */
     private VersionNumberingStandard()
+    {
       mLogger.debug("VersionNumberingStandard");
       mBuild = true;
       mMajor = false;
       mMinor = false;
       mPatch = false;
       mLimit = false;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor true, mMinor false, mPatch false, mLimit false
      */
     void setMajor()
       mBuild = false;
       mMajor = true;
       mMinor = false;
       mPatch = false;
       mLimit = false;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor true, mMinor false, mPatch false, mLimit limit
      */
     void setMajor( boolean limit )
       mBuild = false;
       mMajor = true;
       mMinor = false;
       mPatch = false;
       mLimit = limit;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor false, mMinor true, mPatch false, mLimit false
      */
     void setMinor()
       mBuild = false;
       mMajor = false;
       mMinor = true;
       mPatch = false;
       mLimit = false;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor false, mMinor true, mPatch false, mLimit limit
      */
     void setMinor( boolean limit )
       mBuild = false;
       mMajor = false;
       mMinor = true;
       mPatch = false;
       mLimit = limit;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor false, mMinor false, mPatch true, mLimit false
      */
     void setPatch()
       mBuild = false;
       mMajor = false;
       mMinor = false;
       mPatch = true;
       mLimit = false;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor false, mMinor false, mPatch true, mLimit limit
      */
     void setPatch( boolean limit )
       mBuild = false;
       mMajor = false;
       mMinor = false;
       mPatch = true;
       mLimit = limit;
+      mFixed = false;
+    }
     /**sets mBuild false, mMajor false, mMinor false, mPatch false, mLimit true
      */
     void setLimit()
       mBuild = false;
       mMajor = false;
       mMinor = false;
       mPatch = false;
       mLimit = true;
+      mFixed = false;
+    }
+    /**sets parameters to indicate that the change type is Fixed. The version number is set by the user
+     * and a ripple will not be calculated
+     */
+    void setFixed()
+    {
+        mLogger.debug("setFixed");
+        mBuild = false;
+        mMajor = false;
+        mMinor = false;
+        mPatch = false;
+        mLimit = false;
+        mFixed = true;
+    }
+    /** Sets parameters to indicate that the chnage type is not
+     *  known
+     *
+     */
+    void setUnknown()
+    {
+        mUnknown = true;
+    }
+  }
+}

Subversion Repositories DevTools

(root)/buildtool/trunk/src/generated/com/erggroup/buildtool/ripple/Package.java @ 4212 – Rev 4201 → 4212