comparison: test/make/configure.vm
test/make/configure.vm
- changeset 30
- d4c38bb71fa0
- parent 19
- e05f3e8ec2cb
- child 32
- c3132f7f19da
equal
deleted
inserted
replaced
| 29:5e958351935d | 30:d4c38bb71fa0 |
|---|---|
| 345 #foreach( $pkg in $sub.pkgconfig ) | 345 #foreach( $pkg in $sub.pkgconfig ) |
| 346 $PKG_CONFIG $pkg.getPkgConfigParam() | 346 $PKG_CONFIG $pkg.getPkgConfigParam() |
| 347 if [ $? -ne 0 ] ; then | 347 if [ $? -ne 0 ] ; then |
| 348 break | 348 break |
| 349 fi | 349 fi |
| 350 CFLAGS="$CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`" | 350 TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`" |
| 351 LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`" | 351 TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`" |
| 352 #end | 352 #end |
| 353 #foreach( $flags in $sub.flags ) | 353 #foreach( $flags in $sub.flags ) |
| 354 #if( $flags.exec ) | 354 #if( $flags.exec ) |
| 355 $flags.value > /dev/null | 355 $flags.value > /dev/null |
| 356 if [ $? -eq 0 ]; then | 356 if [ $? -eq 0 ]; then |
| 357 $flags.varName="$$flags.varName `$flags.value`" | 357 TEMP_$flags.varName="$TEMP_$flags.varName `$flags.value`" |
| 358 else | 358 else |
| 359 break | 359 break |
| 360 fi | 360 fi |
| 361 #else | 361 #else |
| 362 $flags.varName="$$flags.varName $flags.value" | 362 TEMP_$flags.varName="$TEMP_$flags.varName $flags.value" |
| 363 #end | 363 #end |
| 364 #end | 364 #end |
| 365 #foreach( $test in $sub.tests ) | 365 #foreach( $test in $sub.tests ) |
| 366 $test > /dev/null | 366 $test > /dev/null |
| 367 if [ $? -ne 0 ]; then | 367 if [ $? -ne 0 ]; then |
| 386 | 386 |
| 387 DEPENDENCIES_FAILED= | 387 DEPENDENCIES_FAILED= |
| 388 ERROR=0 | 388 ERROR=0 |
| 389 #if( $dependencies.size() > 0 ) | 389 #if( $dependencies.size() > 0 ) |
| 390 # general dependencies | 390 # general dependencies |
| 391 CFLAGS= | 391 TEMP_CFLAGS= |
| 392 LDFLAGS= | 392 TEMP_LDFLAGS= |
| 393 #foreach( $dependency in $dependencies ) | 393 #foreach( $dependency in $dependencies ) |
| 394 while true | 394 while true |
| 395 do | 395 do |
| 396 #if( $dependency.platform ) | 396 #if( $dependency.platform ) |
| 397 if isnotplatform "${dependency.platform}"; then | 397 if isnotplatform "${dependency.platform}"; then |
| 418 echo no | 418 echo no |
| 419 ERROR=1 | 419 ERROR=1 |
| 420 break | 420 break |
| 421 fi | 421 fi |
| 422 echo yes | 422 echo yes |
| 423 CFLAGS="$CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`" | 423 TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`" |
| 424 LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`" | 424 TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`" |
| 425 #end | 425 #end |
| 426 | 426 |
| 427 #foreach( $flags in $dependency.flags ) | 427 #foreach( $flags in $dependency.flags ) |
| 428 #if( $flags.exec ) | 428 #if( $flags.exec ) |
| 429 $flags.value > /dev/null | 429 $flags.value > /dev/null |
| 430 if [ $? -ne 0 ]; then | 430 if [ $? -ne 0 ]; then |
| 431 $flags.varName="$$flags.varName `$flags.value`" | 431 TEMP_$flags.varName="$TEMP_$flags.varName `$flags.value`" |
| 432 else | 432 else |
| 433 ERROR=1 | 433 ERROR=1 |
| 434 break | 434 break |
| 435 fi | 435 fi |
| 436 #else | 436 #else |
| 437 $flags.varName="$$flags.varName $flags.value" | 437 TEMP_$flags.varName="$TEMP_$flags.varName $flags.value" |
| 438 #end | 438 #end |
| 439 #end | 439 #end |
| 440 #if ( $dependency.make.length() > 0 ) | 440 #if ( $dependency.make.length() > 0 ) |
| 441 cat >> $TEMP_DIR/make.mk << __EOF__ | 441 cat >> $TEMP_DIR/make.mk << __EOF__ |
| 442 $dependency.make | 442 $dependency.make |
| 450 done | 450 done |
| 451 #end | 451 #end |
| 452 | 452 |
| 453 # add general dependency flags to config.mk | 453 # add general dependency flags to config.mk |
| 454 echo >> $TEMP_DIR/config.mk | 454 echo >> $TEMP_DIR/config.mk |
| 455 if [ ! -z "${CFLAGS}" ]; then | 455 if [ ! -z "${TEMP_CFLAGS}" ]; then |
| 456 echo "CFLAGS += $CFLAGS" >> $TEMP_DIR/config.mk | 456 echo "CFLAGS += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk |
| 457 fi | 457 fi |
| 458 if [ ! -z "${CXXFLAGS}" ]; then | 458 if [ ! -z "${TEMP_CXXFLAGS}" ]; then |
| 459 echo "CXXFLAGS += $CXXFLAGS" >> $TEMP_DIR/config.mk | 459 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk |
| 460 fi | 460 fi |
| 461 if [ ! -z "${LDFLAGS}" ]; then | 461 if [ ! -z "${TEMP_LDFLAGS}" ]; then |
| 462 echo "LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk | 462 echo "LDFLAGS += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk |
| 463 fi | 463 fi |
| 464 #end | 464 #end |
| 465 | 465 |
| 466 # | 466 # |
| 467 # OPTION VALUES | 467 # OPTION VALUES |
| 479 #end | 479 #end |
| 480 if [ $VERR -ne 0 ]; then | 480 if [ $VERR -ne 0 ]; then |
| 481 return 1 | 481 return 1 |
| 482 fi | 482 fi |
| 483 #foreach( $def in $val.defines ) | 483 #foreach( $def in $val.defines ) |
| 484 CFLAGS="$CFLAGS ${def.toFlags()}" | 484 TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}" |
| 485 #end | 485 #end |
| 486 #if( $val.hasMake() ) | 486 #if( $val.hasMake() ) |
| 487 cat >> $TEMP_DIR/make.mk << __EOF__ | 487 cat >> $TEMP_DIR/make.mk << __EOF__ |
| 488 $val.make | 488 $val.make |
| 489 __EOF__ | 489 __EOF__ |
| 494 #end | 494 #end |
| 495 | 495 |
| 496 # | 496 # |
| 497 # TARGETS | 497 # TARGETS |
| 498 # | 498 # |
| 499 CFLAGS= | 499 TEMP_CFLAGS= |
| 500 CXXFLAGS= | 500 TEMP_CXXFLAGS= |
| 501 LDFLAGS= | 501 TEMP_LDFLAGS= |
| 502 | 502 |
| 503 #foreach( $target in $targets ) | 503 #foreach( $target in $targets ) |
| 504 #if ( $target.name ) | 504 #if ( $target.name ) |
| 505 # Target: $target.name | 505 # Target: $target.name |
| 506 #else | 506 #else |
| 507 # Target | 507 # Target |
| 508 #end | 508 #end |
| 509 CFLAGS= | 509 TEMP_CFLAGS= |
| 510 LDFLAGS= | 510 TEMP_LDFLAGS= |
| 511 CXXFLAGS= | 511 TEMP_CXXFLAGS= |
| 512 | 512 |
| 513 #foreach( $dependency in $target.dependencies ) | 513 #foreach( $dependency in $target.dependencies ) |
| 514 dependency_$dependency | 514 dependency_$dependency |
| 515 if [ $? -ne 0 ]; then | 515 if [ $? -ne 0 ]; then |
| 516 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} " | 516 DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} " |
| 578 fi | 578 fi |
| 579 fi | 579 fi |
| 580 #end | 580 #end |
| 581 | 581 |
| 582 echo >> $TEMP_DIR/config.mk | 582 echo >> $TEMP_DIR/config.mk |
| 583 if [ ! -z "${CFLAGS}" ]; then | 583 if [ ! -z "${TEMP_CFLAGS}" ]; then |
| 584 echo "${target.getCFlags()} += $CFLAGS" >> $TEMP_DIR/config.mk | 584 echo "${target.getCFlags()} += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk |
| 585 fi | 585 fi |
| 586 if [ ! -z "${CXXFLAGS}" ]; then | 586 if [ ! -z "${TEMP_CXXFLAGS}" ]; then |
| 587 echo "${target.getCXXFlags()} += $CXXFLAGS" >> $TEMP_DIR/config.mk | 587 echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk |
| 588 fi | 588 fi |
| 589 if [ ! -z "${LDFLAGS}" ]; then | 589 if [ ! -z "${TEMP_LDFLAGS}" ]; then |
| 590 echo "${target.getLDFlags()} += $LDFLAGS" >> $TEMP_DIR/config.mk | 590 echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk |
| 591 fi | 591 fi |
| 592 | 592 |
| 593 #end | 593 #end |
| 594 if [ $ERROR -ne 0 ]; then | 594 if [ $ERROR -ne 0 ]; then |
| 595 echo | 595 echo |
