./build.gradle

rev 9491 : 8144490: Update assemblyIdentity version in javapackager manifest for Verona

*** 464,473 ****
--- 464,475 ----
      }
  } else {
      relVer = "${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseSecurityVersion}.${jfxReleasePatchVersion}"
  }
  defineProperty("RELEASE_VERSION", relVer)
+ defineProperty("RELEASE_VERSION_PADDED", "${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseSecurityVersion}.${jfxReleasePatchVersion}")
+ 
  def buildDate = new java.util.Date()
  def buildTimestamp = new java.text.SimpleDateFormat("yyyy-MM-dd-HHmmss").format(buildDate)
  defineProperty("BUILD_TIMESTAMP", buildTimestamp)
  def relSuffix = ""
  def relOpt = ""
*** 864,873 ****
--- 866,876 ----
  logger.quiet("PRODUCT_NAME: $PRODUCT_NAME")
  logger.quiet("RELEASE_VERSION: $RELEASE_VERSION")
  logger.quiet("RELEASE_SUFFIX: $RELEASE_SUFFIX")
  logger.quiet("RELEASE_VERSION_SHORT: $RELEASE_VERSION_SHORT")
  logger.quiet("RELEASE_VERSION_LONG: $RELEASE_VERSION_LONG")
+ logger.quiet("RELEASE_VERSION_PADDED: $RELEASE_VERSION_PADDED")
  
  if (UPDATE_STUB_CACHE) {
      logger.quiet("UPDATE_STUB_CACHE: $UPDATE_STUB_CACHE")
  }
  
*** 2026,2038 ****
                  copy {
                      mkdir "$buildDir/native"
                      mkdir "$buildDir/native/javapackager"
                      from file("src/main/native/javapackager/win/javapackager.manifest")
                      into file("$buildDir/native/javapackager")
-                     // FIXME: the following is wrong and needs to be fixed
                      filter { line->
!                         line = line.replace("FXVERSION", "${RELEASE_VERSION}.${HUDSON_BUILD_NUMBER}");
                      }
                  }
              }
              doLast {
                  mkdir "$buildDir/native"
--- 2029,2040 ----
                  copy {
                      mkdir "$buildDir/native"
                      mkdir "$buildDir/native/javapackager"
                      from file("src/main/native/javapackager/win/javapackager.manifest")
                      into file("$buildDir/native/javapackager")
                      filter { line->
!                         line = line.replace("FXVERSION", RELEASE_VERSION_PADDED)
                      }
                  }
              }
              doLast {
                  mkdir "$buildDir/native"