Skip to content

more unification #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swordrune10 merged 7 commits into from
Jun 21, 2012
Merged

more unification #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5255471
user repofolder and buildfolder where applicable
swordrune10 Jun 21, 2012
3a7cede
unify reposync, making it shorter code
swordrune10 Jun 21, 2012
7727da5
reposync: move synccode to a better place
swordrune10 Jun 21, 2012
c62d878
headerfile: make dotrepo not yet mapped out
swordrune10 Jun 21, 2012
5415aba
headerfile: attempt getting var not initialized to work
swordrune10 Jun 21, 2012
645e8ba
move dotrepo, buildfolder, and repofolder out of headerfile
swordrune10 Jun 21, 2012
4791ea4
buildandro: fix remove stuff at start of build
swordrune10 Jun 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions build/buildandro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
#!/bin/bash
# Written by Sean Donovan (swordrune10)
#setup build
$LOCAL/config/romeditor
export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" )
export BUILDFOLDER=$( echo "$BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" )
export DOTREPO=$( echo "$REPOFOLDER/.repo" )

rmbuildprop=$(echo "rm -f \$outfolder/system/build.prop")
rmoldzip=$(echo "rm -f \$outfolder/*.zip*")
$LOCAL/config/romeditor

if [ ! "$OTHER_REPO_FOLDER" == "" ]; then
outfolder=$(echo "$OTHER_REPO_FOLDER/out/target/product/$SCRIPT_DEVICE")

$rmbuildprop
$rmoldzip
rm -f $outfolder/system/build.prop
rm -f $outfolder/*.zip*

cd $OTHER_REPO_FOLDER
else
outfolder=$(echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM/out/target/product/$SCRIPT_DEVICE")
outfolder=$(echo "$REPOFOLDER/out/target/product/$SCRIPT_DEVICE")

$rmbuildprop
$rmoldzip
rm -f $outfolder/system/build.prop
rm -f $outfolder/*.zip*

cd $REPOS/$SCRIPT_REPO-$REPO_PLATFORM
cd $REPOFOLDER
fi

. build/envsetup.sh
Expand Down Expand Up @@ -71,7 +72,7 @@ if [ ! "$OTHER_REPO_FOLDER" == "" ]; then
"Build zip is located in $OTHER_REPO_FOLDER/out/target/product/$SCRIPT_DEVICE"
exit 0
else
cd $REPOS/$SCRIPT_REPO-$REPO_PLATFORM/out/target/product/$SCRIPT_DEVICE
cd $REPOFOLDER/out/target/product/$SCRIPT_DEVICE
fi

if [ $SCRIPT_REPO == "cm" ] || [ $SCRIPT_REPO == "sts" ]; then
Expand Down Expand Up @@ -120,27 +121,27 @@ if [ $SCRIPT_REPO == "aosp" ] || [ $SCRIPT_REPO == "rooted-aosp" ]; then
java -Xmx1024m -classpath $LOCAL/testsign.jar testsign unsignedcrap.zip $zip
fi

mkdir -p $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old
mkdir -p $BUILDFOLDER/old

if ( find $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/*$SCRIPT_DEVICE.zip &> /dev/null); then
if ( find $BUILDFOLDER/*$SCRIPT_DEVICE.zip &> /dev/null); then
echo "Moving older build to $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old"

mv $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/*$SCRIPT_DEVICE.zip $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old
mv $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/*$SCRIPT_DEVICE.zip.md5sum $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old
mv $BUILDFOLDER/*$SCRIPT_DEVICE.zip $BUILDFOLDER/old
mv $BUILDFOLDER/*$SCRIPT_DEVICE.zip.md5sum $BUILDFOLDER/old
fi

newzip=$(echo $SCRIPT_REPO-$REPO_PLATFORM-$(date +%Y%m%d)-SWORDKITCHEN-$SCRIPT_DEVICE.zip)

echo "Copying to $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM"
echo "Copying to $BUILDFOLDER"
echo "$zip -> $newzip"
cp $zip $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/$newzip
cp $zip $BUILDFOLDER/$newzip

if [ $SCRIPT_REPO == "aosp" ] || [ $SCRIPT_REPO == "rooted-aosp" ]; then
echo "Cleaning up temporary folder"
cd $BUILDS
rm -r temp
fi

cd $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM
cd $BUILDFOLDER
md5sum $newzip
md5sum $newzip > $newzip.md5sum
Loading