Revision 41944

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/installjammer/gvsig-standard-installer.mpi
281 281
File ::1B718456-0AF4-8BDF-A1ED-E17D27781AD8 -type dir -directory <%InstallDir%> -name /home/cordin/projects/gvsig/svn/gvSIG-2.0-build/build/product -location <%BaseDir%> -parent 0B1D2CFD-CF3F-0A84-2C33-6B9A957B3181
282 282
File ::237C749A-600F-FEDD-F268-EEFEBF8B8044 -name gvsig-desktop.l4j.ini -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
283 283
File ::51F93AE5-2DF0-4276-143B-45EB8ABCE033 -name gvSIG.ico -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
284
File ::7B82CBAB-2682-5010-F13B-C1A53C6C7CF2 -name gvSIG.sh -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
284
File ::7B82CBAB-2682-5010-F13B-C1A53C6C7CF2 -name gvSIG.sh -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
285 285
File ::6AD8155F-6600-2DA9-F69E-2182EDCFA672 -name LEEME.txt -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
286 286
File ::B07FC8E7-C380-B4FC-361E-81FDFE7B627E -name LICENSE.txt -alias ProgramLicense -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
287 287
File ::AC1ADBEF-85EE-5744-EE30-6AF7F2BD0667 -name log4j.properties -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
......
1025 1025
File ::FA87774F-05D3-D642-CAEA-A35C6D17C4B4 -name gvsig-desktop-devel.xml -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1026 1026
File ::C62AC68B-F661-54BD-D0B3-DA080589B4E5 -name gvsig-desktop.xml -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1027 1027
File ::EDE24806-62F7-718E-272A-037A740D1CC9 -name gvsig-package-installer.xml -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1028
File ::A885AB3F-7B17-86E1-9129-64919AEEE0A9 -type dir -name tools -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1028
File ::A885AB3F-7B17-86E1-9129-64919AEEE0A9 -type dir -name tools -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1029 1029
File ::BADF829B-2E7E-FD6D-0F09-EBEA3DED2494 -name busybox.exe -active 0 -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1030 1030
File ::7E6D6B68-D402-04AF-B428-1C1AC23BA973 -name gvsig-desktop-portable.exe -active 0 -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1031 1031
File ::CCDA2D0F-3924-9842-1CCD-2E29A270F2C3 -name check.sh -active 0 -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1032 1032
File ::AB501B79-DC2F-0BB2-12E1-C2AD8F02178B -name check.cmd -active 0 -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1033 1033
File ::1634718B-D75F-24C1-AB51-C326CF759051 -name gvsig-desktop-portable.xml -active 0 -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1034
File ::2705CC5E-8ADD-AD2B-C49A-FDC5E1B2AF26 -name gvSIG.config -active 0 -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1034
File ::2705CC5E-8ADD-AD2B-C49A-FDC5E1B2AF26 -name gvSIG.config -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1035
File ::F06E6777-BB9A-F5C4-ED44-0E6A0561E4AD -name make-portable -parent A885AB3F-7B17-86E1-9129-64919AEEE0A9
1035 1036
File ::73F74753-4F74-7F6E-462D-CF43BEC2DBC4 -name check.sh -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1036 1037
File ::0608E12A-A482-8D0A-030F-E5920619674A -name check.cmd -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1037 1038
FileGroup ::3FCCA384-2783-D981-2506-3A9F5DBE3E9B -setup Install -active Yes -platforms {Linux-x86 Linux-x86_64 TarArchive} -name {Linux i386} -parent FileGroups
1038 1039
File ::F354386B-F812-1B20-D9C2-B49AD74BCD22 -type dir -directory <%InstallDir%> -name /home/cordin/projects/gvsig/svn/gvSIG-2.0-build/build/product -location <%BaseDir%> -parent 3FCCA384-2783-D981-2506-3A9F5DBE3E9B
1039 1040
File ::06A12396-76B5-A686-A109-DE0A80C0AE9F -name gvsig-desktop.l4j.ini -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1040 1041
File ::08919C96-402C-92A9-9AEB-46E704478BDE -name gvSIG.ico -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1041
File ::D79DAF68-0F8F-18E5-FF10-5EB6C385F294 -name gvSIG.sh -permissions 00775 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1042
File ::D79DAF68-0F8F-18E5-FF10-5EB6C385F294 -name gvSIG.sh -permissions 00775 -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1042 1043
File ::3EB35170-C715-4B01-3600-A1AE202B5006 -name LEEME.txt -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1043 1044
File ::EE2EAEEE-F849-D14D-B1A9-1266AB078D22 -name LICENSE.txt -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1044 1045
File ::44BD53EC-1734-96FB-2CE8-657CDE04C590 -name log4j.properties -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
......
1107 1108
File ::97C0F080-1B71-C849-8E97-A3D64F66CF0B -name andami-theme.xml -active 0 -parent 8471F4F1-6F22-494F-8327-7C2E5E0BEBDD
1108 1109
File ::D67BE6C7-008B-6E3E-A363-943FD4A97585 -name README.txt -active 0 -parent 8471F4F1-6F22-494F-8327-7C2E5E0BEBDD
1109 1110
File ::FD8F3E0F-55F1-4B68-8AF2-B5FA493C8F12 -type dir -name update -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1111
File ::F3B73DA0-45AF-3A1B-D2C6-2296A06987FB -name README.txt -parent FD8F3E0F-55F1-4B68-8AF2-B5FA493C8F12
1110 1112
File ::44CF1F29-0C60-6089-4212-114E8CABCD2A -name package.info -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1111 1113
File ::7233770A-6189-7D52-3EF5-FCD51A9425FA -name gvsig-desktop-devel.exe -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1112 1114
File ::44504384-02AD-6C9E-AB3C-B6C3EB1F4A54 -name gvsig-package-installer.exe -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
......
1115 1117
File ::EE9703DC-3D4A-8349-8AAC-D4AB11D34806 -name gvsig-desktop-devel.xml -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1116 1118
File ::8384DF68-F81B-2B4C-0D75-4E829FFD4643 -name gvsig-desktop.xml -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1117 1119
File ::E2FE9ABC-7A77-47FC-ADE7-134EB73221B4 -name gvsig-package-installer.xml -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1118
File ::716ECE7B-80E1-1A81-17AD-C1399ED43DC6 -type dir -name tools -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1120
File ::716ECE7B-80E1-1A81-17AD-C1399ED43DC6 -type dir -name tools -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1119 1121
File ::EDE95166-0AAA-91FD-5B41-EC9CD03F0822 -name busybox.exe -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1120 1122
File ::C0582093-8BC3-A8F7-6E9E-FFC0692D0CD2 -name gvsig-desktop-portable.exe -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1121 1123
File ::3C5C68B3-1488-0D12-542F-EC1DEB53B901 -name check.sh -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1122 1124
File ::F7751223-99C3-3C60-A6FF-AE32D44938F8 -name check.cmd -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1123 1125
File ::0684D2C6-D31B-B8B7-06DA-8EB4DB825E07 -name gvsig-desktop-portable.xml -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1124
File ::34FA4356-1331-D3A3-5288-B1C217C8B428 -name gvSIG.config -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1126
File ::34FA4356-1331-D3A3-5288-B1C217C8B428 -name gvSIG.config -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1127
File ::F6B7D050-76B3-12EB-CE0D-FB9B0FED9DC5 -name make-portable -active 0 -parent 716ECE7B-80E1-1A81-17AD-C1399ED43DC6
1125 1128
File ::D4C5C31D-05F2-2CBF-651F-70DA3B4705B9 -name check.sh -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1126 1129
File ::BDAF1BB1-5BD4-393D-9182-03D4A3FA7446 -name check.cmd -active 0 -parent F354386B-F812-1B20-D9C2-B49AD74BCD22
1127 1130
FileGroup ::F3B4EEE1-118B-7F0B-FC8A-1BD5B7F8AD6D -setup Install -active Yes -platforms {Windows ZipArchive} -name {Windows i386} -parent FileGroups
......
1129 1132
File ::7D31F82A-C84F-AFD1-DF94-935A793FF99C -name gvsig-desktop.exe -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1130 1133
File ::4DB1A373-B221-4228-6B16-40C4AF8B026A -name gvsig-desktop.l4j.ini -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1131 1134
File ::2BBD2461-4548-A42E-DFC4-B401A7E7BD54 -name gvsig-package-installer.exe -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1132
File ::301DFD21-F110-D4B9-96DD-6D58809F8540 -name gvSIG.ico -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1135
File ::301DFD21-F110-D4B9-96DD-6D58809F8540 -name gvSIG.ico -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1133 1136
File ::A874A104-0EE3-ABA8-23E8-7515C42F0DF1 -name gvSIG.sh -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1134 1137
File ::9D39DD15-4484-75D6-B80F-523C6A1C7E6C -name LEEME.txt -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1135 1138
File ::299066F4-0E6F-B97F-163E-8089019FA60F -name LICENSE.txt -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
......
1394 1397
File ::752CA03C-9F3A-4FE9-ACD0-1AD25444E513 -name libtasn1.so.3 -active 0 -parent 17FD9825-22CE-B061-361B-D97EC01B1F8D
1395 1398
File ::9F2F28DF-4304-4C11-9A5D-A6B8234958F6 -name libxerces-c.so.28 -active 0 -parent 17FD9825-22CE-B061-361B-D97EC01B1F8D
1396 1399
File ::735FCBC1-3055-4CDF-9CBF-209F18D93897 -name libz.so.1 -active 0 -parent 17FD9825-22CE-B061-361B-D97EC01B1F8D
1400
File ::F942A410-2F3D-265F-42A1-9B14A8FF5228 -name README.txt -parent 17FD9825-22CE-B061-361B-D97EC01B1F8D
1397 1401
File ::1B33D2F3-A54C-9002-184F-72822D9C3E71 -type dir -name i18n -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1402
File ::97399C95-4978-B94B-772C-D75BA5ED1C05 -name README.txt -parent 1B33D2F3-A54C-9002-184F-72822D9C3E71
1398 1403
File ::EE38D55C-FF56-4100-A989-98A720C91393 -name gvsig-package-installer.l4j.ini -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1399
File ::81B7C17B-08BE-4AB6-98C9-9A5A2DE1484C -name gvsig-desktop-devel.exe -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1404
File ::81B7C17B-08BE-4AB6-98C9-9A5A2DE1484C -name gvsig-desktop-devel.exe -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1400 1405
File ::0B206EE2-641D-F32C-7348-18D2FEC2D2B4 -name gvsig-icon16x16.png -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1401 1406
File ::B2B0DC6F-6F85-EC37-A95C-1328BCE7F3A8 -name gvsig-icon22x22.png -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1402 1407
File ::8518186B-21AD-6425-0D1F-86DBB509F182 -name gvsig-icon48x48.png -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
......
1446 1451
File ::B1C1230C-017A-E511-5F95-D1BEFF5ACDB3 -name gvsig-icon16x16.png -active 0 -parent 78CA798A-AA43-4A12-8D19-5AF6C9D06693
1447 1452
File ::CF6E0E43-92E6-01F0-D2DE-F0BCD53C69F0 -name gvsig-proj-black-wallpaper.png -active 0 -parent 78CA798A-AA43-4A12-8D19-5AF6C9D06693
1448 1453
File ::724DC077-8A6C-708D-3F76-B6279BCEDD44 -name andami-theme.xml -active 0 -parent 78CA798A-AA43-4A12-8D19-5AF6C9D06693
1454
File ::E40DEC85-3410-DA5D-E42F-210DCDA1C6F8 -name README.txt -parent 78CA798A-AA43-4A12-8D19-5AF6C9D06693
1449 1455
File ::E9346655-9764-4441-8A0A-3EBC149351F4 -type dir -name update -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1450 1456
File ::C36F91C9-7CBE-40B0-EB60-A2DBB8870D79 -name package.info -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1451 1457
File ::5EC3BDEC-F9EB-2633-83FD-F2DC4C041441 -name gvsig-desktop.cmd -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1452
File ::A57CB5A2-BB60-7762-8C68-0275413BA44A -name gvsig-desktop-devel.xml -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1458
File ::A57CB5A2-BB60-7762-8C68-0275413BA44A -name gvsig-desktop-devel.xml -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1453 1459
File ::11349629-FBB7-EA32-6CB9-8E572B6F6DF4 -name gvsig-desktop.xml -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1454 1460
File ::516E0709-940F-AD4A-F6B3-1B6067301F0F -name gvsig-package-installer.xml -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1455 1461
File ::015FCC0A-6D64-07CB-34AA-FC1E674F3226 -type dir -name tools -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
......
1458 1464
File ::F9DB1AB2-43DB-05A2-492A-7B9968432FE1 -name check.sh -parent 015FCC0A-6D64-07CB-34AA-FC1E674F3226
1459 1465
File ::30F00F82-3EE0-4723-E70B-7D94F00948DE -name check.cmd -parent 015FCC0A-6D64-07CB-34AA-FC1E674F3226
1460 1466
File ::E93AAAD4-D78F-C860-6D10-A25CAA74145C -name gvsig-desktop-portable.xml -parent 015FCC0A-6D64-07CB-34AA-FC1E674F3226
1461
File ::7FDF6A13-4DE3-4A3F-4B7B-CD66422EB28D -name gvSIG.config -parent 015FCC0A-6D64-07CB-34AA-FC1E674F3226
1467
File ::7FDF6A13-4DE3-4A3F-4B7B-CD66422EB28D -name gvSIG.config -active 0 -parent 015FCC0A-6D64-07CB-34AA-FC1E674F3226
1468
File ::1853045E-D050-EAC8-6630-2848563EFD16 -name make-portable -active 0 -parent 015FCC0A-6D64-07CB-34AA-FC1E674F3226
1462 1469
File ::1D92E982-3DCC-55EE-481B-0528A77EACB9 -name check.sh -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1463 1470
File ::A94BAFB3-1DF4-1316-2128-B3692F99FCB0 -name check.cmd -active 0 -parent D5CF40F1-DF9D-1E2D-FBFC-DFFA740AF249
1464 1471
Component ::EE918467-993A-9E94-31D7-B8C02C46EE4A -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 HPUX-hppa Linux-x86 Linux-x86_64 Solaris-sparc Solaris-x86 Windows} -name {gvSIG core} -parent Components
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/pom.xml
70 70
                  </goals>
71 71
                  <configuration>
72 72
                    <source><![CDATA[
73

  
74 73
// To deploy package use:
75 74
//    mvn -Ddeploy-installers -Dusername=USER -Dpassword=PASSWORD install
76 75
//      
......
243 242
    jre_pkg_name = "gvSIG-desktop-2.1.0-jre_7_windows_i586-1.7.72-0-devel-win-x86-j1_7.gvspkg"
244 243
    url = "http://downloads.gvsig.org/download/gvsig-desktop/pool/jre_7_windows_i586/" + jre_pkg_name
245 244
    target = getProjectTargetPath() + "/" + jre_pkg_name
245
    jre_path = System.getenv()["jre_gvspkg_path"]
246 246
    if(! new File(target).exists() ) {
247
      if( project.properties["jre.path"]!=null ) {
248
        if( project.properties["jre.path"].endsWith(".gvspkg") ) {
249
          source = project.properties["jre.path"]
247
      if( jre_path!=null ) {
248
        if( jre_path.endsWith(".gvspkg") ) {
249
          source = jre_path
250 250
        } else {
251
          source = project.properties["jre.path"] + "/" + jre_pkg_name
251
          source = jre_path + "/" + jre_pkg_name
252 252
        }
253
      if (source.startsWith("~" + File.separator)) {
254
          source = System.getenv().get("HOME") + source.substring(1);
255
      }
253
        if (source.startsWith("~" + File.separator)) {
254
            source = System.getenv().get("HOME") + source.substring(1);
255
        }
256 256
        if( ! new File(source).exists() ) {
257
          log.info("jre specified in jre.path variable not found - "+source)
257
          log.info("jre specified in jre_path variable not found - "+source)
258 258
          log.info("Downloading windows jre plugin")
259 259
          ant.get(src: url, dest: target)
260
      } else {
260
        } else {
261 261
          log.info("Copy windows jre plugin")
262 262
          ant.copy(file:source, todir:getProjectTargetPath() + "/")
263
      }      
263
        }      
264 264
      } else {
265 265
        log.info("Downloading windows jre plugin")
266 266
        ant.get(src: url, dest: target)
......
343 343
    log.info("Download busybox.exe.")
344 344
    ant.get(src: "http://downloads.gvsig.org/download/gvsig-desktop/runtimes/winutils/busybox.exe", dest: gvsig_product_folder_path+"/tools/busybox.exe")
345 345

  
346
    // De momento duplicamos el busybox, pero deberia corregirse en el installjamer
347
    // para que lo busque en tools.                                                
348
    ant.copy(file:gvsig_product_folder_path+"/tools/busybox.exe", todir:gvsig_product_folder_path+"/busybox.exe")
349

  
350 346
    source = getProjectTargetPath() + "/" + jre_pkg_name
351 347
    target = gvsig_product_folder_path + "/gvSIG/extensiones/"
352 348
    log.info("Installing plugin windows jre plugin to " + target + "...")

Also available in: Unified diff