From 14f754f1608a0f8ca62ead485669d88cc651667d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 06:08:34 -0400 Subject: begin integrating building of llphysicsextensions from source here (incomplete) --- autobuild.xml | 98 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 77 insertions(+), 21 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index d31235e6d3..e66bfb12ae 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -855,6 +855,54 @@ + havok-source + + license + havok-ares + license_file + LICENSES/havok.txt + name + havok-source + platforms + + darwin + + archive + + hash + b5d4e877d18b6cb03d63a6c2d9db30b3 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/prep_3p-havok-source-vs2010/rev/256766/arch/Darwin/installer/havok_source-2011.3-darwin-20120514.tar.bz2 + + name + darwin + + linux + + archive + + hash + 9f34927ecb175b1d6fa18bd079afeac4 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_vs2010/rev/256766/arch/Linux/installer/havok_source-2011.3-linux-20120514.tar.bz2 + + name + linux + + windows + + archive + + hash + da689c64e71cc9a26e71d376054daab5 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/256766/arch/CYGWIN/installer/havok_source-2011.3-windows-20120514.tar.bz2 + + name + windows + + + jpeglib license @@ -1095,14 +1143,14 @@ - llphysicsextensions + llphysicsextensions_source license - llphysicsextensions + TEMPORARY license_file LICENSES/llphysicsextensions.txt name - llphysicsextensions + llphysicsextensions_source platforms darwin @@ -1110,38 +1158,46 @@ archive hash - 96dba4139682980285103586e3e2b981 + ea98ebb0babcf7018bf5c10996be178a + hash_algorithm + md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260794/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120627.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2 name darwin - linux - - archive - - hash - 140b9c68ac84c0e2cf40e22e3c5695f4 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260794/arch/Linux/installer/llphysicsextensions-0.1-linux-20120628.tar.bz2 - - name - linux - - windows + + version + 0.2 + + llphysicsextensions_stub + + license + TEMPORARY + license_file + LICENSES/llphysicsextensions.txt + name + llphysicsextensions_stub + platforms + + darwin archive hash - f1af9983fa482e09a4c4d9b4b1ea6492 + eb016d162ac4714ebdfc3331ce080827 + hash_algorithm + md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/260794/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120627.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2 name - windows + darwin + version + 0.2 llqtwebkit -- cgit v1.2.3 From 1cad2d9de2bdb5f7964dde57825d62767403a6fb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 06:33:47 -0400 Subject: update to 20120702 build of havok --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e66bfb12ae..fe8700e64b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -870,9 +870,9 @@ archive hash - b5d4e877d18b6cb03d63a6c2d9db30b3 + 4ceeb68ac59a2b999a069b27020f76d3 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/prep_3p-havok-source-vs2010/rev/256766/arch/Darwin/installer/havok_source-2011.3-darwin-20120514.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261056/arch/Darwin/installer/havok_source-2012.1-darwin-20120702.tar.bz2 name darwin @@ -882,9 +882,9 @@ archive hash - 9f34927ecb175b1d6fa18bd079afeac4 + 0591902d3e7eff848f71915df86d8837 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_vs2010/rev/256766/arch/Linux/installer/havok_source-2011.3-linux-20120514.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261056/arch/Linux/installer/havok_source-2012.1-linux-20120702.tar.bz2 name linux @@ -894,9 +894,9 @@ archive hash - da689c64e71cc9a26e71d376054daab5 + 3a860c548aa311dc4e09d17a3a914a98 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/256766/arch/CYGWIN/installer/havok_source-2011.3-windows-20120514.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/falcon_3p-havok-source/rev/261056/arch/CYGWIN/installer/havok_source-2012.1-windows-20120702.tar.bz2 name windows -- cgit v1.2.3 From 21ee5f8d415920827a477ae236f30e7d09dc8e9f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 09:39:21 -0400 Subject: successful build with llphysicsextensions stub --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index fe8700e64b..60c7b4c118 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - ea98ebb0babcf7018bf5c10996be178a + 75b3266c3d51b6ae767158969a20a324 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 name darwin @@ -1186,11 +1186,11 @@ archive hash - eb016d162ac4714ebdfc3331ce080827 + 5e6db8ede04aeda9f508fe31df6500c9 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 name darwin -- cgit v1.2.3 From 92fb00683594ad83ea36dca6fe4fdafbb778c470 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 12:16:02 -0400 Subject: update llphysicsextensions source and stub packages --- autobuild.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 60c7b4c118..c95e27403d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,15 +1158,39 @@ archive hash - 75b3266c3d51b6ae767158969a20a324 + e538ad2f2c8cb3eeab8e00be32bd3261 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 name darwin + linux + + archive + + hash + 22a9feeada730fd66575f7a3678d6358 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120705.tar.bz2 + + name + linux + + windows + + archive + + hash + d1a6d5fd1bc01f0da22eba5660daa100 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120705.tar.bz2 + + name + windows + version 0.2 @@ -1186,15 +1210,39 @@ archive hash - 5e6db8ede04aeda9f508fe31df6500c9 + a598897c0e79157e4dcbd153556c2879 hash_algorithm md5 url - file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 name darwin + linux + + archive + + hash + 928e1ff00189f982d4df8f9183b67a20 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120705.tar.bz2 + + name + linux + + windows + + archive + + hash + 2c930f2ffc4ed8c622498ebbac05477c + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120705.tar.bz2 + + name + windows + version 0.2 -- cgit v1.2.3 From 9c4d1c779135fe59fdfe974137cedecd21d3d511 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 9 Jul 2012 12:57:18 -0400 Subject: changes to build real sources (works locally on a Mac) --- autobuild.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index c95e27403d..b169f62ebd 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - e538ad2f2c8cb3eeab8e00be32bd3261 + 8898ec8834b897e2b305f5e36a0cc1f6 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 name darwin @@ -1172,9 +1172,9 @@ archive hash - 22a9feeada730fd66575f7a3678d6358 + 3ee3b8d3a8ff2503bc1df90b34a90a77 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 name linux @@ -1184,9 +1184,9 @@ archive hash - d1a6d5fd1bc01f0da22eba5660daa100 + 5a067fc092bd7c568eb65b52504fea5b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261193/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 name windows @@ -1210,11 +1210,11 @@ archive hash - a598897c0e79157e4dcbd153556c2879 + a77d2704a5332f1d90f7d85789b68c07 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120709.tar.bz2 name darwin @@ -1224,9 +1224,9 @@ archive hash - 928e1ff00189f982d4df8f9183b67a20 + 52b0b20d66b89db81da8ad19f5164599 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120709.tar.bz2 name linux @@ -1236,9 +1236,9 @@ archive hash - 2c930f2ffc4ed8c622498ebbac05477c + 36231aa7b761e6039f9c1c6d005a7984 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261193/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120705.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120709.tar.bz2 name windows -- cgit v1.2.3 From e2dffdb38ee1833ad37728d4b07fd4bc37c9675a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 9 Jul 2012 17:52:53 -0400 Subject: update llphysicsextension-source build to address linux build issue --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index b169f62ebd..4d582e1342 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - 8898ec8834b897e2b305f5e36a0cc1f6 + cb52304ae7fcc232330f7891a901e658 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 name darwin @@ -1172,9 +1172,9 @@ archive hash - 3ee3b8d3a8ff2503bc1df90b34a90a77 + 26f353bd58bcd921630e03d123273d27 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 name linux @@ -1184,9 +1184,9 @@ archive hash - 5a067fc092bd7c568eb65b52504fea5b + c630a9c0b11639667b5a0b2136a734f7 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261360/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 name windows -- cgit v1.2.3 From 14acd7de30e2eb2e7c6c4fe59dd26a4317e99f34 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Jul 2012 17:44:55 -0400 Subject: experimental change for windows debug build --- autobuild.xml | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 4d582e1342..cc6e3c710d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1158,11 +1158,11 @@ archive hash - cb52304ae7fcc232330f7891a901e658 + 5f75735d1092b087b3373ca874c41593 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261490/arch/Darwin/installer/llphysicsextensions_source-0.2-darwin-20120710.tar.bz2 name darwin @@ -1172,9 +1172,9 @@ archive hash - 26f353bd58bcd921630e03d123273d27 + 911f46354e338a7013f023385a3f905f url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261490/arch/Linux/installer/llphysicsextensions_source-0.2-linux-20120710.tar.bz2 name linux @@ -1184,9 +1184,9 @@ archive hash - c630a9c0b11639667b5a0b2136a734f7 + b1212ec910042d186836d496d288984c url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261395/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120709.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-source/rev/261490/arch/CYGWIN/installer/llphysicsextensions_source-0.2-windows-20120710.tar.bz2 name windows @@ -1210,39 +1210,15 @@ archive hash - a77d2704a5332f1d90f7d85789b68c07 + d7665ce1324110bdfad0b846e864f6f9 hash_algorithm md5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Darwin/installer/llphysicsextensions_stub-0.2-darwin-20120709.tar.bz2 + file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120710.tar.bz2 name darwin - linux - - archive - - hash - 52b0b20d66b89db81da8ad19f5164599 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/Linux/installer/llphysicsextensions_stub-0.2-linux-20120709.tar.bz2 - - name - linux - - windows - - archive - - hash - 36231aa7b761e6039f9c1c6d005a7984 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/oz_llphysicsextensions-stub/rev/261360/arch/CYGWIN/installer/llphysicsextensions_stub-0.2-windows-20120709.tar.bz2 - - name - windows - version 0.2 -- cgit v1.2.3