From 3964b97ae551d0bbdda7e9464ce29e40ba2c9a93 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Mon, 9 May 2011 02:56:52 +0300 Subject: [PATCH] OP-483: Update Windows build environment subdirectory USE_BOOTLOADER now deprecated and removed. Scripts are moved into the same subdirectories like in msysGit. Added make.sh script (for advanced usage scenario). Few misprints are fixed. --- make/winx86/README.txt | 10 +++++----- make/winx86/{ => bin}/make | 0 make/winx86/cmd/make.sh | 1 + make/winx86/{ => cmd}/sh.cmd | 0 4 files changed, 6 insertions(+), 5 deletions(-) rename make/winx86/{ => bin}/make (100%) create mode 100644 make/winx86/cmd/make.sh rename make/winx86/{ => cmd}/sh.cmd (100%) diff --git a/make/winx86/README.txt b/make/winx86/README.txt index 9677e9368..6024dd118 100644 --- a/make/winx86/README.txt +++ b/make/winx86/README.txt @@ -46,8 +46,8 @@ Now you need to copy two files to your msysGit installation folders. Assuming that you installed the msysGit into C:\Program Files\Git\, you have to copy: - make\winx86\make -> C:\Program Files\Git\bin\ - make\winx86\sh.cmd -> C:\Program Files\Git\cmd\ + make\winx86\bin\make -> C:\Program Files\Git\bin\ + make\winx86\cmd\sh.cmd -> C:\Program Files\Git\cmd\ If you have msysGit installed into another directory, you need to update paths accordingly. Also if you have tools installed into different directories and @@ -93,7 +93,7 @@ software and flight firmware built in the end. 4) To build parts of the system you can use, for example, such commands: user@pc /d/Work/OpenPilot/git (master) - $ make -j2 USE_BOOTLOADER=YES GCS_BUIL_CONF=release gcs coptercontrol bl_coptercontrol + $ make -j2 GCS_BUILD_CONF=release gcs coptercontrol or to completely remove the build directory: @@ -109,7 +109,7 @@ or to completely remove the build directory: #!/bin/sh # This is the cc_make_release.sh file used to build CC release software cd D:/Work/OpenPilot/git - make -j2 USE_BOOTLOADER=YES GCS_BUIL_CONF=release gcs coptercontrol bl_coptercontrol + make -j2 GCS_BUILD_CONF=release gcs coptercontrol echo RC=$? 2) Run it typing: @@ -170,7 +170,7 @@ to get rid of git bash welcome message on every script invocation. Currently there may be some problems running scripts which contain spaces in file names or located in directories which contain spaces in full paths. -It results in in strange "file not found" or other errors. +It results in strange "file not found" or other errors. It is recommended to avoid using such names with spaces. diff --git a/make/winx86/make b/make/winx86/bin/make similarity index 100% rename from make/winx86/make rename to make/winx86/bin/make diff --git a/make/winx86/cmd/make.sh b/make/winx86/cmd/make.sh new file mode 100644 index 000000000..70ff64114 --- /dev/null +++ b/make/winx86/cmd/make.sh @@ -0,0 +1 @@ +exec /bin/make $* diff --git a/make/winx86/sh.cmd b/make/winx86/cmd/sh.cmd similarity index 100% rename from make/winx86/sh.cmd rename to make/winx86/cmd/sh.cmd